From ce812466c749c6abb45e57efe24b01e0f511e0b5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 11 Jun 2017 17:13:43 +0200 Subject: Fix removal of status sending the original status to mentioned users instead of delete Salmon (#3672) * Fix removal of status sending the original status to mentioned users instead of delete Salmon, add test * Create remove_status_service_spec.rb --- spec/services/remove_status_service_spec.rb | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 spec/services/remove_status_service_spec.rb (limited to 'spec') diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb new file mode 100644 index 000000000..a3bce7613 --- /dev/null +++ b/spec/services/remove_status_service_spec.rb @@ -0,0 +1,40 @@ +require 'rails_helper' + +RSpec.describe RemoveStatusService do + subject { RemoveStatusService.new } + + let!(:alice) { Fabricate(:account) } + let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', salmon_url: 'http://example.com/salmon') } + let!(:jeff) { Fabricate(:account) } + + before do + stub_request(:post, 'http://example.com/push').to_return(status: 200, body: '', headers: {}) + stub_request(:post, 'http://example.com/salmon').to_return(status: 200, body: '', headers: {}) + + Fabricate(:subscription, account: alice, callback_url: 'http://example.com/push', confirmed: true, expires_at: 30.days.from_now) + jeff.follow!(alice) + @status = PostStatusService.new.call(alice, 'Hello @bob@example.com') + subject.call(@status) + end + + it 'removes status from author\'s home feed' do + expect(Feed.new(:home, alice).get(10)).to_not include(@status.id) + end + + it 'removes status from local follower\'s home feed' do + expect(Feed.new(:home, jeff).get(10)).to_not include(@status.id) + end + + it 'sends PuSH update to PuSH subscribers' do + expect(a_request(:post, 'http://example.com/push').with { |req| + req.body.match(TagManager::VERBS[:delete]) + }).to have_been_made + end + + it 'sends Salmon slap to previously mentioned users' do + expect(a_request(:post, "http://example.com/salmon").with { |req| + xml = OStatus2::Salmon.new.unpack(req.body) + xml.match(TagManager::VERBS[:delete]) + }).to have_been_made.once + end +end -- cgit