mirror of
https://github.com/mastodon/mastodon
synced 2024-12-27 21:18:11 +09:00
14f6ce2885
* 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 a015c65d2d.
* 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
44 lines
1.6 KiB
Ruby
44 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe UnblockDomainService, type: :service do
|
|
subject { described_class.new }
|
|
|
|
describe 'call' do
|
|
before do
|
|
@independently_suspended = Fabricate(:account, domain: 'example.com', suspended_at: 1.hour.ago)
|
|
@independently_silenced = Fabricate(:account, domain: 'example.com', silenced_at: 1.hour.ago)
|
|
@domain_block = Fabricate(:domain_block, domain: 'example.com')
|
|
@silenced = Fabricate(:account, domain: 'example.com', silenced_at: @domain_block.created_at)
|
|
@suspended = Fabricate(:account, domain: 'example.com', suspended_at: @domain_block.created_at)
|
|
end
|
|
|
|
it 'unsilences accounts and removes block' do
|
|
@domain_block.update(severity: :silence)
|
|
|
|
subject.call(@domain_block)
|
|
expect_deleted_domain_block
|
|
expect(@silenced.reload.silenced?).to be false
|
|
expect(@suspended.reload.suspended?).to be true
|
|
expect(@independently_suspended.reload.suspended?).to be true
|
|
expect(@independently_silenced.reload.silenced?).to be true
|
|
end
|
|
|
|
it 'unsuspends accounts and removes block' do
|
|
@domain_block.update(severity: :suspend)
|
|
|
|
subject.call(@domain_block)
|
|
expect_deleted_domain_block
|
|
expect(@suspended.reload.suspended?).to be false
|
|
expect(@silenced.reload.silenced?).to be true
|
|
expect(@independently_suspended.reload.suspended?).to be true
|
|
expect(@independently_silenced.reload.silenced?).to be true
|
|
end
|
|
end
|
|
|
|
def expect_deleted_domain_block
|
|
expect { @domain_block.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
|
end
|
|
end
|