diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/unit/role_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/role_test.rb')
| -rw-r--r-- | test/unit/role_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb index 710120dab..e1ba993ee 100644 --- a/test/unit/role_test.rb +++ b/test/unit/role_test.rb @@ -21,16 +21,16 @@ class RoleTest < ActiveSupport::TestCase fixtures :roles, :workflows, :trackers def test_sorted_scope - assert_equal Role.all.sort, Role.sorted.all + assert_equal Role.all.sort, Role.sorted.to_a end def test_givable_scope - assert_equal Role.all.reject(&:builtin?).sort, Role.givable.all + assert_equal Role.all.reject(&:builtin?).sort, Role.givable.to_a end def test_builtin_scope - assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).all.sort - assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).all.sort + assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).to_a.sort + assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).to_a.sort end def test_copy_from |