]> git.openstreetmap.org Git - rails.git/blobdiff - test/integration/user_roles_test.rb
Improve tests for trace RSS feeds
[rails.git] / test / integration / user_roles_test.rb
index c2f065e0e869556d70d29806a5f2f205febea3fc..7001abd3dc9c2a30c2860bf416a0be5ec682daea 100644 (file)
@@ -26,14 +26,14 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     assert_redirected_to "controller" => "user", "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
@@ -44,14 +44,14 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     assert_redirected_to "controller" => "user", "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