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

Allow revokers to edit revoked blocks

Browse source
This commit is contained in:
Anton Khorev 2024-07-25 04:29:43 +03:00
parent d88cb014cb
commit 2764591a7d
3 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

53
test/controllers/user_blocks_controller_test.rb
View file

@ -483,23 +483,32 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_equal "Original Reason", block.reason
session_for(creator_user)
check_block_updates(block)
end
##
# test the update action on revoked blocks
def test_update_revoked
creator_user = create(:moderator_user)
revoker_user = create(:moderator_user)
other_moderator_user = create(:moderator_user)
block = create(:user_block, :revoked, :creator => creator_user, :revoker => revoker_user, :reason => "Original Reason")
session_for(other_moderator_user)
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Updated Reason" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
assert_redirected_to edit_user_block_path(block)
assert_equal "Only the moderators who created or revoked this block can edit it.", flash[:error]
block.reload
assert_not block.active?
assert_equal "Updated Reason", block.reason
assert_not_predicate block, :active?
assert_equal "Original Reason", block.reason
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => true, :reason => "Updated Reason 2" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_predicate block, :active?
assert_equal "Updated Reason 2", block.reason
session_for(creator_user)
check_block_updates(block)
session_for(revoker_user)
check_block_updates(block)
end
##
@ -794,6 +803,26 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
private
def check_block_updates(block)
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Updated Reason" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason", block.reason
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => true, :reason => "Updated Reason 2" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_predicate block, :active?
assert_equal "Updated Reason 2", block.reason
end
def check_user_blocks_table(user_blocks)
assert_dom "table#block_list tbody tr" do |rows|
assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table"