##// END OF EJS Templates
Rails4: replace deprecated Relation#first with finder options at UsersControllerTest...
Toshi MARUYAMA -
r12361:45496b0eb2b5
parent child
Show More
@@ -169,7 +169,7 class UsersControllerTest < ActionController::TestCase
169 end
169 end
170 end
170 end
171
171
172 user = User.first(:order => 'id DESC')
172 user = User.order('id DESC').first
173 assert_redirected_to :controller => 'users', :action => 'edit', :id => user.id
173 assert_redirected_to :controller => 'users', :action => 'edit', :id => user.id
174
174
175 assert_equal 'John', user.firstname
175 assert_equal 'John', user.firstname
@@ -204,7 +204,7 class UsersControllerTest < ActionController::TestCase
204 'warn_on_leaving_unsaved' => '0'
204 'warn_on_leaving_unsaved' => '0'
205 }
205 }
206 end
206 end
207 user = User.first(:order => 'id DESC')
207 user = User.order('id DESC').first
208 assert_equal 'jdoe', user.login
208 assert_equal 'jdoe', user.login
209 assert_equal true, user.pref.hide_mail
209 assert_equal true, user.pref.hide_mail
210 assert_equal 'Paris', user.pref.time_zone
210 assert_equal 'Paris', user.pref.time_zone
@@ -430,7 +430,7 class UsersControllerTest < ActionController::TestCase
430 post :edit_membership, :id => 7, :membership => { :project_id => 3, :role_ids => [2]}
430 post :edit_membership, :id => 7, :membership => { :project_id => 3, :role_ids => [2]}
431 end
431 end
432 assert_redirected_to :action => 'edit', :id => '7', :tab => 'memberships'
432 assert_redirected_to :action => 'edit', :id => '7', :tab => 'memberships'
433 member = Member.first(:order => 'id DESC')
433 member = Member.order('id DESC').first
434 assert_equal User.find(7), member.principal
434 assert_equal User.find(7), member.principal
435 assert_equal [2], member.role_ids
435 assert_equal [2], member.role_ids
436 assert_equal 3, member.project_id
436 assert_equal 3, member.project_id
@@ -443,7 +443,7 class UsersControllerTest < ActionController::TestCase
443 assert_template 'edit_membership'
443 assert_template 'edit_membership'
444 assert_equal 'text/javascript', response.content_type
444 assert_equal 'text/javascript', response.content_type
445 end
445 end
446 member = Member.first(:order => 'id DESC')
446 member = Member.order('id DESC').first
447 assert_equal User.find(7), member.principal
447 assert_equal User.find(7), member.principal
448 assert_equal [2], member.role_ids
448 assert_equal [2], member.role_ids
449 assert_equal 3, member.project_id
449 assert_equal 3, member.project_id
General Comments 0
You need to be logged in to leave comments. Login now