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

Merge remote-tracking branch 'upstream/pull/3409'

Browse source
This commit is contained in:
Tom Hughes 2022-01-05 18:40:13 +00:00
commit dcaf21602c
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/abilities/ability.rb
View file

@ -23,7 +23,7 @@ class Ability
can [:index, :show], Redaction
can [:new, :create, :destroy], :session
can [:index, :show, :data, :georss, :picture, :icon], Trace
can [:terms, :new, :create, :save, :show, :auth_success, :auth_failure], User
can [:terms, :new, :create, :save, :suspended, :show, :auth_success, :auth_failure], User
can [:index, :show, :blocks_on, :blocks_by], UserBlock
can [:index, :show], Node
can [:index, :show, :full, :ways_for_node], Way

15
test/system/user_suspension_test.rb Normal file
View file

@ -0,0 +1,15 @@
require "application_system_test_case"
class UserSuspensionTest < ApplicationSystemTestCase
test "User shown a message when suspended mid-session" do
user = create(:user)
sign_in_as(user)
visit edit_account_path
assert_content "My Settings"
user.update(:status => "suspended")
visit edit_account_path
assert_content "This decision will be reviewed by an administrator shortly"
end
end