FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix suspending an already-limited domain (#25603)

This commit is contained in:
Claire 2023-06-27 12:32:51 +02:00 committed by GitHub
parent ceca93d0d1
commit c7c6f02ae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/domain_blocks/confirm_suspension.html.haml
View File

@ -4,7 +4,7 @@
- content_for :page_title do - content_for :page_title do
= t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain)) = t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
= simple_form_for @domain_block, url: admin_domain_blocks_path(@domain_block) do |f| = simple_form_for @domain_block, url: admin_domain_blocks_path, method: :post do |f|
%p.hint= t('.preamble_html', domain: Addressable::IDNA.to_unicode(@domain_block.domain)) %p.hint= t('.preamble_html', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
%ul.hint %ul.hint

4
spec/features/admin/domain_blocks_spec.rb
View File

@ -53,7 +53,7 @@ describe 'blocking domains through the moderation interface' do
# Confirming updates the block # Confirming updates the block
click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm') click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
expect(domain_block.reload.severity).to eq 'silence' expect(domain_block.reload.severity).to eq 'suspend'
end end
end end
@ -72,7 +72,7 @@ describe 'blocking domains through the moderation interface' do
# Confirming updates the block # Confirming updates the block
click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm') click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
expect(domain_block.reload.severity).to eq 'silence' expect(domain_block.reload.severity).to eq 'suspend'
end end
end end
end end