summaryrefslogtreecommitdiffstats
path: root/test/functional/roles_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 20:23:48 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-02 20:23:48 +0000
commit536747b74708188848d85d8de5df34e7aa762006 (patch)
treec7cfe03314c047dff313825c8548d056e5e1af29 /test/functional/roles_controller_test.rb
parent96fca0b08f6d60e8736e8e3f95a5d0ae33779068 (diff)
downloadredmine-536747b74708188848d85d8de5df34e7aa762006.tar.gz
redmine-536747b74708188848d85d8de5df34e7aa762006.zip
Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/roles_controller_test.rb')
-rw-r--r--test/functional/roles_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 8aa74457a..68c573ac6 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -34,7 +34,7 @@ class RolesControllerTest < ActionController::TestCase
assert_template 'index'
assert_not_nil assigns(:roles)
- assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
+ assert_equal Role.order('builtin, position').all, assigns(:roles)
assert_tag :tag => 'a', :attributes => { :href => '/roles/1/edit' },
:content => 'Manager'
@@ -163,7 +163,7 @@ class RolesControllerTest < ActionController::TestCase
assert_template 'permissions'
assert_not_nil assigns(:roles)
- assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
+ assert_equal Role.order('builtin, position').all, assigns(:roles)
assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
:name => 'permissions[3][]',