Fix changing domain block severity not undoing individual account effects (#22135)
* Fix changing domain block severity not undoing individual account effects Fixes #22133 * Add testsgh/stable
parent
1e49be3328
commit
8556a649d5
|
@ -55,12 +55,8 @@ module Admin
|
||||||
def update
|
def update
|
||||||
authorize :domain_block, :update?
|
authorize :domain_block, :update?
|
||||||
|
|
||||||
@domain_block.update(update_params)
|
if @domain_block.update(update_params)
|
||||||
|
DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
|
||||||
severity_changed = @domain_block.severity_changed?
|
|
||||||
|
|
||||||
if @domain_block.save
|
|
||||||
DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
|
|
||||||
log_action :update, @domain_block
|
log_action :update, @domain_block
|
||||||
redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
|
redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
|
||||||
else
|
else
|
||||||
|
|
|
@ -40,10 +40,8 @@ class Api::V1::Admin::DomainBlocksController < Api::BaseController
|
||||||
|
|
||||||
def update
|
def update
|
||||||
authorize @domain_block, :update?
|
authorize @domain_block, :update?
|
||||||
@domain_block.update(domain_block_params)
|
@domain_block.update!(domain_block_params)
|
||||||
severity_changed = @domain_block.severity_changed?
|
DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
|
||||||
@domain_block.save!
|
|
||||||
DomainBlockWorker.perform_async(@domain_block.id, severity_changed)
|
|
||||||
log_action :update, @domain_block
|
log_action :update, @domain_block
|
||||||
render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
|
render json: @domain_block, serializer: REST::Admin::DomainBlockSerializer
|
||||||
end
|
end
|
||||||
|
|
|
@ -70,6 +70,53 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'PUT #update' do
|
||||||
|
let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
|
||||||
|
let(:domain_block) { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
BlockDomainService.new.call(domain_block)
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:subject) do
|
||||||
|
post :update, params: { id: domain_block.id, domain_block: { domain: 'example.com', severity: new_severity } }
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'downgrading a domain suspension to silence' do
|
||||||
|
let(:original_severity) { 'suspend' }
|
||||||
|
let(:new_severity) { 'silence' }
|
||||||
|
|
||||||
|
it 'changes the block severity' do
|
||||||
|
expect { subject }.to change { domain_block.reload.severity }.from('suspend').to('silence')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'undoes individual suspensions' do
|
||||||
|
expect { subject }.to change { remote_account.reload.suspended? }.from(true).to(false)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'performs individual silences' do
|
||||||
|
expect { subject }.to change { remote_account.reload.silenced? }.from(false).to(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'upgrading a domain silence to suspend' do
|
||||||
|
let(:original_severity) { 'silence' }
|
||||||
|
let(:new_severity) { 'suspend' }
|
||||||
|
|
||||||
|
it 'changes the block severity' do
|
||||||
|
expect { subject }.to change { domain_block.reload.severity }.from('silence').to('suspend')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'undoes individual silences' do
|
||||||
|
expect { subject }.to change { remote_account.reload.silenced? }.from(true).to(false)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'performs individual suspends' do
|
||||||
|
expect { subject }.to change { remote_account.reload.suspended? }.from(false).to(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'DELETE #destroy' do
|
describe 'DELETE #destroy' do
|
||||||
it 'unblocks the domain' do
|
it 'unblocks the domain' do
|
||||||
service = double(call: true)
|
service = double(call: true)
|
||||||
|
|
|
@ -71,6 +71,53 @@ RSpec.describe Api::V1::Admin::DomainBlocksController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'PUT #update' do
|
||||||
|
let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
|
||||||
|
let(:domain_block) { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
BlockDomainService.new.call(domain_block)
|
||||||
|
end
|
||||||
|
|
||||||
|
let(:subject) do
|
||||||
|
post :update, params: { id: domain_block.id, domain: 'example.com', severity: new_severity }
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'downgrading a domain suspension to silence' do
|
||||||
|
let(:original_severity) { 'suspend' }
|
||||||
|
let(:new_severity) { 'silence' }
|
||||||
|
|
||||||
|
it 'changes the block severity' do
|
||||||
|
expect { subject }.to change { domain_block.reload.severity }.from('suspend').to('silence')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'undoes individual suspensions' do
|
||||||
|
expect { subject }.to change { remote_account.reload.suspended? }.from(true).to(false)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'performs individual silences' do
|
||||||
|
expect { subject }.to change { remote_account.reload.silenced? }.from(false).to(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'upgrading a domain silence to suspend' do
|
||||||
|
let(:original_severity) { 'silence' }
|
||||||
|
let(:new_severity) { 'suspend' }
|
||||||
|
|
||||||
|
it 'changes the block severity' do
|
||||||
|
expect { subject }.to change { domain_block.reload.severity }.from('silence').to('suspend')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'undoes individual silences' do
|
||||||
|
expect { subject }.to change { remote_account.reload.silenced? }.from(true).to(false)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'performs individual suspends' do
|
||||||
|
expect { subject }.to change { remote_account.reload.suspended? }.from(false).to(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'DELETE #destroy' do
|
describe 'DELETE #destroy' do
|
||||||
let!(:block) { Fabricate(:domain_block) }
|
let!(:block) { Fabricate(:domain_block) }
|
||||||
|
|
||||||
|
|
Reference in New Issue