about summary refs log tree commit diff
path: root/spec/services
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-26 14:09:01 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-04-26 20:09:01 +0200
commit8857cabca42fc21d3063862c9954e079e7efd275 (patch)
tree88220d4d8fa0f258db5a545dc3be923ac4f0af41 /spec/services
parentaffd75936e069a28247274683e6015d2b66910c1 (diff)
Domain block service cleanup (#2490)
* Add coverage for domain block service with silence

* Get rid of warning about find_each and order

* Move domain_block to attr_reader

* Move optional clear_media into silence_accounts method

* Use blocked_domain method to reduce passed vars

* Extract blocked_domain_accounts method to find accounts on the domain

* Extract media_from_blocked_domain method to find relevant attachments

* Separate destruction of account images and account attachments
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/block_domain_service_spec.rb47
1 files changed, 36 insertions, 11 deletions
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 8e71d4542..5c2cfc8c7 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -13,21 +13,46 @@ RSpec.describe BlockDomainService do
     bad_status1
     bad_status2
     bad_attachment
-
-    subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
   end
 
-  it 'creates a domain block' do
-    expect(DomainBlock.blocked?('evil.org')).to be true
-  end
+  describe 'for a suspension' do
+    before do
+      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :suspend))
+    end
+
+    it 'creates a domain block' do
+      expect(DomainBlock.blocked?('evil.org')).to be true
+    end
+
+    it 'removes remote accounts from that domain' do
+      expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true
+    end
 
-  it 'removes remote accounts from that domain' do
-    expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true
+    it 'removes the remote accounts\'s statuses and media attachments' do
+      expect { bad_status1.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { bad_status2.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+    end
   end
 
-  it 'removes the remote accounts\'s statuses and media attachments' do
-    expect { bad_status1.reload }.to raise_exception ActiveRecord::RecordNotFound
-    expect { bad_status2.reload }.to raise_exception ActiveRecord::RecordNotFound
-    expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+  describe 'for a silence with reject media' do
+    before do
+      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
+    end
+
+    it 'does not create a domain block' do
+      expect(DomainBlock.blocked?('evil.org')).to be false
+    end
+
+    it 'silences remote accounts from that domain' do
+      expect(Account.find_remote('badguy666', 'evil.org').silenced?).to be 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