mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-30 06:28:27 +09:00
89f40b6c3e
* Split media cleanup from reject-media domain blocks to its own service * Slightly improve ClearDomainMediaService error handling * Lower DomainClearMediaWorker to lowest-priority queue * Do not catch ActiveRecord::RecordNotFound in domain block workers * Fix DomainBlockWorker spec labels * Add some specs * Change domain blocks to immediately mark accounts as suspended Rather than doing so sequentially, account after account, while cleaning their data. This doesn't change much about the time the block takes to complete, but it immediately prevents interaction with the blocked domain, while up to now, it would only be guaranteed when the process ends.
24 lines
1008 B
Ruby
24 lines
1008 B
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe ClearDomainMediaService, type: :service do
|
|
let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
|
|
let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
|
|
let!(:bad_status2) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
|
|
let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status2, file: attachment_fixture('attachment.jpg')) }
|
|
|
|
subject { ClearDomainMediaService.new }
|
|
|
|
describe 'for a silence with reject media' do
|
|
before do
|
|
subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
|
|
end
|
|
|
|
it 'leaves the domains status and attachements, but clears media' do
|
|
expect { bad_status1.reload }.not_to raise_error
|
|
expect { bad_status2.reload }.not_to raise_error
|
|
expect { bad_attachment.reload }.not_to raise_error
|
|
expect(bad_attachment.file.exists?).to be false
|
|
end
|
|
end
|
|
end
|