X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eac26c9a2ca1a5fa3a85f1196416a7d324ba7663..26b47fdd188d126bef2e5829d5cc460bad530e2a:/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..f9e321406 100644 --- a/test/controllers/user_roles_controller_test.rb +++ b/test/controllers/user_roles_controller_test.rb @@ -23,14 +23,14 @@ 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" + 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] @@ -40,7 +40,7 @@ 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" @@ -48,20 +48,20 @@ class UserRolesControllerTest < ActionController::TestCase # 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_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) # ...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_equal "The user already has role #{role}.", flash[:error] @@ -69,7 +69,7 @@ class UserRolesControllerTest < ActionController::TestCase # 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_equal "The string `no_such_role' is not a valid role.", flash[:error] @@ -84,14 +84,14 @@ 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" + 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] @@ -101,7 +101,7 @@ 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" @@ -109,20 +109,20 @@ class UserRolesControllerTest < ActionController::TestCase # 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_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) # ...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_equal "The user does not have role #{role}.", flash[:error] @@ -130,9 +130,14 @@ class UserRolesControllerTest < ActionController::TestCase # 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_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_equal "Cannot revoke administrator role from current user.", flash[:error] end end