Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Record account suspend/silence time and keep track of domain blocks (#10660)

Browse source 
* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive
This commit is contained in:
ThibG 2019-05-14 19:05:02 +02:00 • committed by Eugen Rochko
parent 564106c5d6
commit 14f6ce2885
30 changed files with 226 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/controllers/admin/domain_blocks_controller_spec.rb
View file

@ -63,9 +63,9 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
service = double(call: true)
allow(UnblockDomainService).to receive(:new).and_return(service)
domain_block = Fabricate(:domain_block)
delete :destroy, params: { id: domain_block.id, domain_block: { retroactive: '1' } }
delete :destroy, params: { id: domain_block.id }
expect(service).to have_received(:call).with(domain_block, true)
expect(service).to have_received(:call).with(domain_block)
expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
expect(response).to redirect_to(admin_instances_path(limited: '1'))
end