use a controller method to handle cancan denials

[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 c2f065e0e869556d70d29806a5f2f205febea3fc..000ea0316082041096b216301e5c3a81d897facf 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -26,13 +26,13 @@ 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}"
+    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
 
     reset!
@@ -44,13 +44,13 @@ 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}"
+    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
 
     reset!