X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae4c00da8cd87b77f08ff011b0d61ea6851c9f13..efd50cd529990069dc1ca95f66ec6f61471fe29d:/test/integration/user_roles_test.rb

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index c2f065e0e..9d367150d 100644
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -23,17 +23,17 @@ 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", "username" => create(user).email, "password" => "test", :referer => "/"
+    post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
 
     target_user = create(:user)
-    post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}"
-    assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+    post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
+    assert_redirected_to user_path(target_user)
 
     reset!
   end
@@ -41,17 +41,17 @@ 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", "username" => create(user).email, "password" => "test", :referer => "/"
+    post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
 
     target_user = create(:user)
-    post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}"
-    assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+    post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
+    assert_redirected_to user_path(target_user)
 
     reset!
   end