Project

General

Profile

« Previous | Next » 

Revision 445dd7ab

Added by Daniel Lobato Garcia almost 9 years ago

Fixes #11089 - Adapt tests to Rails 4

This commit contains all changes to tests in branch
https://github.com/theforeman/foreman/pull/2055 that I found to be
retrocompatible with Rails 3. The more of these we can get in, the less
code we will have to review for Rails 4, and the more relevant it will
be, as it'll be all completly Rails 4 specific.

View differences:

test/unit/user_role_test.rb
cached_user_roles = user.cached_user_roles.map(&:role)
user.roles.each do |role|
assert_include cached_user_roles, role
assert_includes cached_user_roles, role
end
end
......
users = @semiadmin_users + [@admin_user] + [@superadmin_user]
users.each do |user|
cached_user_roles = user.cached_user_roles
assert_include cached_user_roles.map(&:role), user_role.role
assert_include cached_user_roles.map(&:user_role), user_role
assert_includes cached_user_roles.map(&:role), user_role.role
assert_includes cached_user_roles.map(&:user_role), user_role
end
end
......
users = @semiadmin_users + [@admin_user] + [@superadmin_user]
users.each do |user|
assert_include user.cached_user_roles.map(&:role), new_role
assert_includes user.cached_user_roles.map(&:role), new_role
end
end
......
users = [@admin_user, @superadmin_user]
users.each do |user|
assert_include user.cached_user_roles.map(&:role), user_role.role
assert_includes user.cached_user_roles.map(&:role), user_role.role
end
users = @semiadmin_users

Also available in: Unified diff