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

Change submit button on block edit page when can only revoke

Browse source
This commit is contained in:
Anton Khorev 2024-08-21 17:07:40 +03:00
parent 11a7bf7e0e
commit 76736bab4f
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/user_blocks_controller_test.rb
View file

@ -278,9 +278,10 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_select "textarea#user_block_reason", :count => 1
assert_select "select#user_block_period", :count => 0
assert_select "input#user_block_needs_view[type='checkbox']", :count => 0
assert_select "input[type='submit'][value='Update block']", :count => 0
assert_select "input#user_block_period[type='hidden']", :count => 1
assert_select "input#user_block_needs_view[type='hidden']", :count => 1
assert_select "input[type='submit'][value='Update block']", :count => 1
assert_select "input[type='submit'][value='Revoke block']", :count => 1
end
# Login as the block creator
@ -294,9 +295,10 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_select "textarea#user_block_reason", :count => 1
assert_select "select#user_block_period", :count => 1
assert_select "input#user_block_needs_view[type='checkbox']", :count => 1
assert_select "input[type='submit'][value='Update block']", :count => 1
assert_select "input#user_block_period[type='hidden']", :count => 0
assert_select "input#user_block_needs_view[type='hidden']", :count => 0
assert_select "input[type='submit'][value='Update block']", :count => 1
assert_select "input[type='submit'][value='Revoke block']", :count => 0
end
# We should get an error if the user doesn't exist

2
test/system/user_blocks_test.rb
View file

@ -111,7 +111,7 @@ class UserBlocksSystemTest < ApplicationSystemTestCase
assert_no_field "Needs view"
fill_in "Reason", :with => "Revoking 0-hour blocks works"
click_on "Update block"
click_on "Revoke block"
assert_text(/Revoker:\s+#{Regexp.escape other_moderator_user.display_name}/)
assert_text(/Status:\s+Ended/)
assert_text(/Reason for block:\s+Revoking 0-hour blocks works/)