X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eac26c9a2ca1a5fa3a85f1196416a7d324ba7663..b4dbf6233c3785e62af5bd313381f1844e5bbc19:/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 c7e5926ad..ba3d795de 100644
--- a/test/controllers/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -23,16 +23,15 @@ class UserRolesControllerTest < ActionController::TestCase
     super_user = create(:super_user)
 
     # Granting should fail when not logged in
-    post :grant, :display_name => target_user.display_name, :role => "moderator"
+    post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
     assert_response :forbidden
 
     # Login as an unprivileged user
     session[:user] = normal_user.id
 
     # Granting should still fail
-    post :grant, :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]
+    post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id
@@ -40,38 +39,38 @@ class UserRolesControllerTest < ActionController::TestCase
     UserRole::ALL_ROLES.each do |role|
       # Granting a role to a non-existent user should fail
       assert_difference "UserRole.count", 0 do
-        post :grant, :display_name => "non_existent_user", :role => role
+        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, :display_name => super_user.display_name, :role => role
+        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, :display_name => target_user.display_name, :role => role
+        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, :display_name => target_user.display_name, :role => role
+        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
 
     # Granting a non-existent role should fail
     assert_difference "UserRole.count", 0 do
-      post :grant, :display_name => target_user.display_name, :role => "no_such_role"
+      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
 
@@ -84,16 +83,15 @@ class UserRolesControllerTest < ActionController::TestCase
     super_user = create(:super_user)
 
     # Revoking should fail when not logged in
-    post :revoke, :display_name => target_user.display_name, :role => "moderator"
+    post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
     assert_response :forbidden
 
     # Login as an unprivileged user
     session[:user] = normal_user.id
 
     # Revoking should still fail
-    post :revoke, :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]
+    post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id
@@ -101,38 +99,43 @@ class UserRolesControllerTest < ActionController::TestCase
     UserRole::ALL_ROLES.each do |role|
       # Removing a role from a non-existent user should fail
       assert_difference "UserRole.count", 0 do
-        post :revoke, :display_name => "non_existent_user", :role => role
+        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, :display_name => target_user.display_name, :role => role
+        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, :display_name => super_user.display_name, :role => role
+        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, :display_name => super_user.display_name, :role => role
+        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
 
     # Revoking a non-existent role should fail
     assert_difference "UserRole.count", 0 do
-      post :revoke, :display_name => target_user.display_name, :role => "no_such_role"
+      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)
+    assert_equal "Cannot revoke administrator role from current user.", flash[:error]
   end
 end