X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c..5708c25e04a3d31796771fbcb44485bf601cec8b:/test/controllers/user_roles_controller_test.rb

diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
index f9e321406..ba3d795de 100644
--- a/test/controllers/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -31,8 +31,7 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Granting should still fail
     post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
-    assert_redirected_to user_path(target_user.display_name)
-    assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id
@@ -43,27 +42,27 @@ class UserRolesControllerTest < ActionController::TestCase
         post :grant, :params => { :display_name => "non_existent_user", :role => role }
       end
       assert_response :not_found
-      assert_template "user/no_such_user"
+      assert_template "users/no_such_user"
       assert_select "h1", "The user non_existent_user does not exist"
 
       # Granting a role to a user that already has it should fail
       assert_no_difference "UserRole.count" do
         post :grant, :params => { :display_name => super_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(super_user.display_name)
+      assert_redirected_to user_path(super_user)
       assert_equal "The user already has role #{role}.", flash[:error]
 
       # Granting a role to a user that doesn't have it should work...
       assert_difference "UserRole.count", 1 do
         post :grant, :params => { :display_name => target_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(target_user.display_name)
+      assert_redirected_to user_path(target_user)
 
       # ...but trying a second time should fail
       assert_no_difference "UserRole.count" do
         post :grant, :params => { :display_name => target_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(target_user.display_name)
+      assert_redirected_to user_path(target_user)
       assert_equal "The user already has role #{role}.", flash[:error]
     end
 
@@ -71,7 +70,7 @@ class UserRolesControllerTest < ActionController::TestCase
     assert_difference "UserRole.count", 0 do
       post :grant, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
     end
-    assert_redirected_to user_path(target_user.display_name)
+    assert_redirected_to user_path(target_user)
     assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
   end
 
@@ -92,8 +91,7 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Revoking should still fail
     post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
-    assert_redirected_to user_path(target_user.display_name)
-    assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id
@@ -104,27 +102,27 @@ class UserRolesControllerTest < ActionController::TestCase
         post :revoke, :params => { :display_name => "non_existent_user", :role => role }
       end
       assert_response :not_found
-      assert_template "user/no_such_user"
+      assert_template "users/no_such_user"
       assert_select "h1", "The user non_existent_user does not exist"
 
       # Removing a role from a user that doesn't have it should fail
       assert_no_difference "UserRole.count" do
         post :revoke, :params => { :display_name => target_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(target_user.display_name)
+      assert_redirected_to user_path(target_user)
       assert_equal "The user does not have role #{role}.", flash[:error]
 
       # Removing a role from a user that has it should work...
       assert_difference "UserRole.count", -1 do
         post :revoke, :params => { :display_name => super_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(super_user.display_name)
+      assert_redirected_to user_path(super_user)
 
       # ...but trying a second time should fail
       assert_no_difference "UserRole.count" do
         post :revoke, :params => { :display_name => super_user.display_name, :role => role }
       end
-      assert_redirected_to user_path(super_user.display_name)
+      assert_redirected_to user_path(super_user)
       assert_equal "The user does not have role #{role}.", flash[:error]
     end
 
@@ -132,12 +130,12 @@ class UserRolesControllerTest < ActionController::TestCase
     assert_difference "UserRole.count", 0 do
       post :revoke, :params => { :display_name => target_user.display_name, :role => "no_such_role" }
     end
-    assert_redirected_to user_path(target_user.display_name)
+    assert_redirected_to user_path(target_user)
     assert_equal "The string `no_such_role' is not a valid role.", flash[:error]
 
     # Revoking administrator role from current user should fail
     post :revoke, :params => { :display_name => administrator_user.display_name, :role => "administrator" }
-    assert_redirected_to user_path(administrator_user.display_name)
+    assert_redirected_to user_path(administrator_user)
     assert_equal "Cannot revoke administrator role from current user.", flash[:error]
   end
 end