Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / test / integration / user_roles_test.rb

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 000ea0316082041096b216301e5c3a81d897facf..9d367150dd9d4baba4406f7856d66e5169ec6b72 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -23,7 +23,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
   def check_fail(action, user, role)
     get "/login"
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
@@ -33,7 +33,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
 
     target_user = create(:user)
     post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
-    assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+    assert_redirected_to user_path(target_user)
 
     reset!
   end
@@ -41,7 +41,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
   def check_success(action, user, role)
     get "/login"
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
     post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
@@ -51,7 +51,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
 
     target_user = create(:user)
     post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
-    assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+    assert_redirected_to user_path(target_user)
 
     reset!
   end