Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -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][]',
|
||||
|
||||
@@ -306,7 +306,10 @@ class WorkflowsControllerTest < ActionController::TestCase
|
||||
|
||||
# Returns an array of status transitions that can be compared
|
||||
def status_transitions(conditions)
|
||||
WorkflowTransition.find(:all, :conditions => conditions,
|
||||
:order => 'tracker_id, role_id, old_status_id, new_status_id').collect {|w| [w.old_status, w.new_status_id]}
|
||||
WorkflowTransition.
|
||||
where(conditions).
|
||||
order('tracker_id, role_id, old_status_id, new_status_id').
|
||||
all.
|
||||
collect {|w| [w.old_status, w.new_status_id]}
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user