2 files changed, 94 insertions, 0 deletions
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
index 93b244cc3..f1d3d949c 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
@@ -82,6 +82,36 @@ describe Api::V1::Statuses::ReblogsController do
         end
       end
 
+      context 'with public status when blocked by its author' do
+        let(:status) { Fabricate(:status, account: user.account) }
+
+        before do
+          ReblogService.new.call(user.account, status)
+          status.account.block!(user.account)
+          post :destroy, params: { status_id: status.id }
+        end
+
+        it 'returns http success' do
+          expect(response).to have_http_status(200)
+        end
+
+        it 'updates the reblogs count' do
+          expect(status.reblogs.count).to eq 0
+        end
+
+        it 'updates the reblogged attribute' do
+          expect(user.account.reblogged?(status)).to be false
+        end
+
+        it 'returns json with updated attributes' do
+          hash_body = body_as_json
+
+          expect(hash_body[:id]).to eq status.id.to_s
+          expect(hash_body[:reblogs_count]).to eq 0
+          expect(hash_body[:reblogged]).to be false
+        end
+      end
+
       context 'with private status that was not reblogged' do
         let(:status) { Fabricate(:status, visibility: :private) }
 
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
new file mode 100644
index 000000000..559e152fb
--- /dev/null
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+RSpec.describe UnallowDomainService, 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')) }
+  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
+  let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
+
+  subject { UnallowDomainService.new }
+
+  context 'in limited federation mode' do
+    before do
+      allow(subject).to receive(:whitelist_mode?).and_return(true)
+    end
+
+    describe '#call' do
+      before do
+        subject.call(domain_allow)
+      end
+
+      it 'removes the allowed domain' do
+        expect(DomainAllow.allowed?('evil.org')).to be false
+      end
+
+      it 'removes remote accounts from that domain' do
+        expect(Account.where(domain: 'evil.org').exists?).to be false
+      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
+      end
+    end
+  end
+
+  context 'without limited federation mode' do
+    before do
+      allow(subject).to receive(:whitelist_mode?).and_return(false)
+    end
+
+    describe '#call' do
+      before do
+        subject.call(domain_allow)
+      end
+
+      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_status1.reload }.to_not raise_exception ActiveRecord::RecordNotFound
+        expect { bad_status2.reload }.to_not raise_exception ActiveRecord::RecordNotFound
+        expect { bad_attachment.reload }.to_not raise_exception ActiveRecord::RecordNotFound
+      end
+    end
+  end
+end