Reduced repeated setup in UnallowDomainService
spec (#28785)
This commit is contained in:
parent
6c5a2d51bc
commit
3d82040b26
1 changed files with 23 additions and 30 deletions
|
@ -5,12 +5,13 @@ require 'rails_helper'
|
|||
RSpec.describe UnallowDomainService, type: :service do
|
||||
subject { described_class.new }
|
||||
|
||||
let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
|
||||
let(:bad_domain) { 'evil.org' }
|
||||
let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: bad_domain) }
|
||||
let!(:bad_status_harassment) { Fabricate(:status, account: bad_account, text: 'You suck') }
|
||||
let!(:bad_status_mean) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
|
||||
let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status_mean, file: attachment_fixture('attachment.jpg')) }
|
||||
let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
|
||||
let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
|
||||
let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: bad_domain, suspended: true, silenced: true) }
|
||||
let!(:domain_allow) { Fabricate(:domain_allow, domain: bad_domain) }
|
||||
|
||||
context 'with limited federation mode', :sidekiq_inline do
|
||||
before do
|
||||
|
@ -18,23 +19,15 @@ RSpec.describe UnallowDomainService, type: :service do
|
|||
end
|
||||
|
||||
describe '#call' do
|
||||
before do
|
||||
subject.call(domain_allow)
|
||||
end
|
||||
it 'makes the domain not allowed and removes accounts from that domain' do
|
||||
expect { subject.call(domain_allow) }
|
||||
.to change { bad_domain_allowed }.from(true).to(false)
|
||||
.and change { bad_domain_account_exists }.from(true).to(false)
|
||||
|
||||
it 'removes the allowed domain' do
|
||||
expect(DomainAllow.allowed?('evil.org')).to be false
|
||||
end
|
||||
|
||||
it 'removes remote accounts from that domain' do
|
||||
expect { already_banned_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
expect(Account.where(domain: 'evil.org').exists?).to be false
|
||||
end
|
||||
|
||||
it 'removes the remote accounts\'s statuses and media attachments' do
|
||||
expect { bad_status_harassment.reload }.to raise_exception ActiveRecord::RecordNotFound
|
||||
expect { bad_status_mean.reload }.to raise_exception ActiveRecord::RecordNotFound
|
||||
expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
|
||||
expect { bad_status_harassment.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
expect { bad_status_mean.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
expect { bad_attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -45,23 +38,23 @@ RSpec.describe UnallowDomainService, type: :service do
|
|||
end
|
||||
|
||||
describe '#call' do
|
||||
before do
|
||||
subject.call(domain_allow)
|
||||
end
|
||||
it 'makes the domain not allowed but preserves accounts from the domain' do
|
||||
expect { subject.call(domain_allow) }
|
||||
.to change { bad_domain_allowed }.from(true).to(false)
|
||||
.and not_change { bad_domain_account_exists }.from(true)
|
||||
|
||||
it 'removes the allowed domain' do
|
||||
expect(DomainAllow.allowed?('evil.org')).to be false
|
||||
end
|
||||
|
||||
it 'does not remove accounts from that domain' do
|
||||
expect(Account.where(domain: 'evil.org').exists?).to be true
|
||||
end
|
||||
|
||||
it 'removes the remote accounts\'s statuses and media attachments' do
|
||||
expect { bad_status_harassment.reload }.to_not raise_error
|
||||
expect { bad_status_mean.reload }.to_not raise_error
|
||||
expect { bad_attachment.reload }.to_not raise_error
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def bad_domain_allowed
|
||||
DomainAllow.allowed?(bad_domain)
|
||||
end
|
||||
|
||||
def bad_domain_account_exists
|
||||
Account.exists?(domain: bad_domain)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue