Spec coverage and refactor for pubsub/delivery worker (#3021)
* Framework for delivery worker spec * Refactor of pubsub delivery worker
This commit is contained in:
		
				
					committed by
					
						
						Eugen Rochko
					
				
			
			
				
	
			
			
			
						parent
						
							a1fc2cfa09
						
					
				
				
					commit
					0d70fe2659
				
			@@ -8,7 +8,7 @@ describe Pubsubhubbub::ConfirmationWorker do
 | 
			
		||||
  subject { described_class.new }
 | 
			
		||||
 | 
			
		||||
  let!(:alice) { Fabricate(:account, username: 'alice') }
 | 
			
		||||
  let!(:subscription) { Fabricate(:subscription, account_id: alice.id, callback_url: 'http://example.com/api', confirmed: false, expires_at: 3.days.from_now, secret: nil) }
 | 
			
		||||
  let!(:subscription) { Fabricate(:subscription, account: alice, callback_url: 'http://example.com/api', confirmed: false, expires_at: 3.days.from_now, secret: nil) }
 | 
			
		||||
 | 
			
		||||
  describe 'perform' do
 | 
			
		||||
    describe 'with subscribe mode' do
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										78
									
								
								spec/workers/pubsubhubbub/delivery_worker_spec.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										78
									
								
								spec/workers/pubsubhubbub/delivery_worker_spec.rb
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,78 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
describe Pubsubhubbub::DeliveryWorker do
 | 
			
		||||
  include RoutingHelper
 | 
			
		||||
  subject { described_class.new }
 | 
			
		||||
 | 
			
		||||
  let(:payload) { 'test' }
 | 
			
		||||
 | 
			
		||||
  describe 'perform' do
 | 
			
		||||
    it 'raises when subscription does not exist' do
 | 
			
		||||
      expect { subject.perform 123, payload }.to raise_error(ActiveRecord::RecordNotFound)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'does not attempt to deliver when domain blocked' do
 | 
			
		||||
      _domain_block = Fabricate(:domain_block, domain: 'example.com', severity: :suspend)
 | 
			
		||||
      subscription = Fabricate(:subscription, callback_url: 'https://example.com/api', last_successful_delivery_at: 2.days.ago)
 | 
			
		||||
 | 
			
		||||
      subject.perform(subscription.id, payload)
 | 
			
		||||
 | 
			
		||||
      expect(subscription.reload.last_successful_delivery_at).to be_within(2).of(2.days.ago)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'destroys subscription when request fails permanently' do
 | 
			
		||||
      subscription = Fabricate(:subscription)
 | 
			
		||||
 | 
			
		||||
      stub_request_to_respond_with(subscription, 404)
 | 
			
		||||
      subject.perform(subscription.id, payload)
 | 
			
		||||
 | 
			
		||||
      expect { subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'raises when request fails' do
 | 
			
		||||
      subscription = Fabricate(:subscription)
 | 
			
		||||
 | 
			
		||||
      stub_request_to_respond_with(subscription, 500)
 | 
			
		||||
      expect { subject.perform(subscription.id, payload) }.to raise_error(/Delivery failed/)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates subscriptions when delivery succeeds' do
 | 
			
		||||
      subscription = Fabricate(:subscription)
 | 
			
		||||
 | 
			
		||||
      stub_request_to_respond_with(subscription, 200)
 | 
			
		||||
      subject.perform(subscription.id, payload)
 | 
			
		||||
 | 
			
		||||
      expect(subscription.reload.last_successful_delivery_at).to be_within(2).of(Time.now.utc)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'updates subscription without a secret when delivery succeeds' do
 | 
			
		||||
      subscription = Fabricate(:subscription, secret: nil)
 | 
			
		||||
 | 
			
		||||
      stub_request_to_respond_with(subscription, 200)
 | 
			
		||||
      subject.perform(subscription.id, payload)
 | 
			
		||||
 | 
			
		||||
      expect(subscription.reload.last_successful_delivery_at).to be_within(2).of(Time.now.utc)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def stub_request_to_respond_with(subscription, code)
 | 
			
		||||
      stub_request(:post, 'http://example.com/callback')
 | 
			
		||||
        .with(body: payload, headers: expected_headers(subscription))
 | 
			
		||||
        .to_return(status: code, body: '', headers: {})
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def expected_headers(subscription)
 | 
			
		||||
      {
 | 
			
		||||
        'Connection' => 'close',
 | 
			
		||||
        'Content-Type' => 'application/atom+xml',
 | 
			
		||||
        'Host' => 'example.com',
 | 
			
		||||
        'Link' => "<https://#{Rails.configuration.x.local_domain}/api/push>; rel=\"hub\", <https://#{Rails.configuration.x.local_domain}/users/#{subscription.account.username}.atom>; rel=\"self\"",
 | 
			
		||||
        'User-Agent' => 'Mastodon/PubSubHubbub',
 | 
			
		||||
      }.tap do |basic|
 | 
			
		||||
        known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload)
 | 
			
		||||
        basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret?
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@@ -5,8 +5,8 @@ describe Pubsubhubbub::DistributionWorker do
 | 
			
		||||
 | 
			
		||||
  let!(:alice) { Fabricate(:account, username: 'alice') }
 | 
			
		||||
  let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example2.com') }
 | 
			
		||||
  let!(:anonymous_subscription) { Fabricate(:subscription, account_id: alice.id, callback_url: 'http://example1.com', confirmed: true, lease_seconds: 3600) }
 | 
			
		||||
  let!(:subscription_with_follower) { Fabricate(:subscription, account_id: alice.id, callback_url: 'http://example2.com', confirmed: true, lease_seconds: 3600) }
 | 
			
		||||
  let!(:anonymous_subscription) { Fabricate(:subscription, account: alice, callback_url: 'http://example1.com', confirmed: true, lease_seconds: 3600) }
 | 
			
		||||
  let!(:subscription_with_follower) { Fabricate(:subscription, account: alice, callback_url: 'http://example2.com', confirmed: true, lease_seconds: 3600) }
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    bob.follow!(alice)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user