cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'openstreetmap/pull/1483'

Browse source
This commit is contained in:
Tom Hughes 2017-03-09 18:35:57 +00:00
commit 685df702ef
4 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/controllers/user_roles_controller_test.rb
View file

@ -20,11 +20,7 @@ class UserRolesControllerTest < ActionController::TestCase
target_user = create(:user)
normal_user = create(:user)
administrator_user = create(:administrator_user)
# Create a super user which has all known roles
super_user = create(:user)
UserRole::ALL_ROLES.each do |role|
create(:user_role, :user => super_user, :granter => administrator_user, :role => role)
end
super_user = create(:super_user)
# Granting should fail when not logged in
post :grant, :display_name => target_user.display_name, :role => "moderator"
@ -85,11 +81,7 @@ class UserRolesControllerTest < ActionController::TestCase
target_user = create(:user)
normal_user = create(:user)
administrator_user = create(:administrator_user)
# Create a super user which has all known roles
super_user = create(:user)
UserRole::ALL_ROLES.each do |role|
create(:user_role, :user => super_user, :granter => administrator_user, :role => role)
end
super_user = create(:super_user)
# Revoking should fail when not logged in
post :revoke, :display_name => target_user.display_name, :role => "moderator"