gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-09 19:29:15 +00:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Add checks for delivery failure tracker to relay spec

Browse Source
This commit is contained in:
Matt Jankowski 2025-09-03 08:34:31 -04:00
parent 624c024766
commit 04dbc4d19e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spec/models/relay_spec.rb
View File

@ -33,7 +33,7 @@ RSpec.describe Relay do
describe 'Callbacks' do describe 'Callbacks' do
describe 'Ensure disabled on destroy' do describe 'Ensure disabled on destroy' do
before { stub_delivery_worker } before { stub_services }
context 'when relay is enabled' do context 'when relay is enabled' do
let(:relay) { Fabricate :relay, state: :accepted } let(:relay) { Fabricate :relay, state: :accepted }
@ -71,7 +71,7 @@ RSpec.describe Relay do
describe '#disable' do describe '#disable' do
let(:relay) { Fabricate :relay, state: :accepted, follow_activity_id: 'https://host.example/123' } let(:relay) { Fabricate :relay, state: :accepted, follow_activity_id: 'https://host.example/123' }
before { stub_delivery_worker } before { stub_services }
it 'changes state to idle and removes the activity id' do it 'changes state to idle and removes the activity id' do
expect { relay.disable! } expect { relay.disable! }
@ -79,13 +79,15 @@ RSpec.describe Relay do
.and change { relay.reload.follow_activity_id }.to(be_nil) .and change { relay.reload.follow_activity_id }.to(be_nil)
expect(ActivityPub::DeliveryWorker) expect(ActivityPub::DeliveryWorker)
.to have_received(:perform_async).with(match('Undo'), Account.representative.id, relay.inbox_url) .to have_received(:perform_async).with(match('Undo'), Account.representative.id, relay.inbox_url)
expect(DeliveryFailureTracker)
.to have_received(:reset!).with(relay.inbox_url)
end end
end end
describe '#enable' do describe '#enable' do
let(:relay) { Fabricate :relay, state: :idle, follow_activity_id: '' } let(:relay) { Fabricate :relay, state: :idle, follow_activity_id: '' }
before { stub_delivery_worker } before { stub_services }
it 'changes state to pending and populates the activity id' do it 'changes state to pending and populates the activity id' do
expect { relay.enable! } expect { relay.enable! }
@ -93,10 +95,13 @@ RSpec.describe Relay do
.and change { relay.reload.follow_activity_id }.to(be_present) .and change { relay.reload.follow_activity_id }.to(be_present)
expect(ActivityPub::DeliveryWorker) expect(ActivityPub::DeliveryWorker)
.to have_received(:perform_async).with(match('Follow'), Account.representative.id, relay.inbox_url) .to have_received(:perform_async).with(match('Follow'), Account.representative.id, relay.inbox_url)
expect(DeliveryFailureTracker)
.to have_received(:reset!).with(relay.inbox_url)
end end
end end
def stub_delivery_worker def stub_services
allow(ActivityPub::DeliveryWorker).to receive(:perform_async) allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
allow(DeliveryFailureTracker).to receive(:reset!)
end end
end end