From da91b18a8b2424f26546eae19ad68473969961c0 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 10 Feb 2022 14:57:10 +0100 Subject: [PATCH] Fix NoMethodError in StatusUpdateDistributionWorker (#17499) * Add tests * Fix NoMethodError in StatusUpdateDistributionWorker * Fix tests --- .../status_update_distribution_worker.rb | 1 + .../status_update_distribution_worker_spec.rb | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 spec/workers/activitypub/status_update_distribution_worker_spec.rb diff --git a/app/workers/activitypub/status_update_distribution_worker.rb b/app/workers/activitypub/status_update_distribution_worker.rb index 261aaa0cc..a79ede2bf 100644 --- a/app/workers/activitypub/status_update_distribution_worker.rb +++ b/app/workers/activitypub/status_update_distribution_worker.rb @@ -6,6 +6,7 @@ class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWor def perform(status_id, options = {}) @options = options.with_indifferent_access @status = Status.find(status_id) + @account = @status.account distribute! rescue ActiveRecord::RecordNotFound diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb new file mode 100644 index 000000000..6633b601f --- /dev/null +++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb @@ -0,0 +1,48 @@ +require 'rails_helper' + +describe ActivityPub::StatusUpdateDistributionWorker do + subject { described_class.new } + + let(:status) { Fabricate(:status, text: 'foo') } + let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com') } + + describe '#perform' do + before do + follower.follow!(status.account) + + status.snapshot! + status.text = 'bar' + status.edited_at = Time.now.utc + status.snapshot! + status.save! + end + + context 'with public status' do + before do + status.update(visibility: :public) + end + + it 'delivers to followers' do + expect(ActivityPub::DeliveryWorker).to receive(:push_bulk) do |items, &block| + expect(items.map(&block)).to match([[kind_of(String), status.account.id, 'http://example.com', anything]]) + end + + subject.perform(status.id) + end + end + + context 'with private status' do + before do + status.update(visibility: :private) + end + + it 'delivers to followers' do + expect(ActivityPub::DeliveryWorker).to receive(:push_bulk) do |items, &block| + expect(items.map(&block)).to match([[kind_of(String), status.account.id, 'http://example.com', anything]]) + end + + subject.perform(status.id) + end + end + end +end