Merge bf2d991412 into 74fc4dbacf

spec/lib/activitypub/activity/accept_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe ActivityPub::Activity::Accept do
         expect(DistributionWorker)
           .to have_enqueued_sidekiq_job(status.id, { 'update' => true })
         expect(ActivityPub::StatusUpdateDistributionWorker)
-          .to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
+          .to have_enqueued_sidekiq_job(status.id, { 'update_id' => be_a(String) })
       end
 
       context 'when the quoted status is not from the sender of the Accept' do
@@ -153,7 +153,7 @@ RSpec.describe ActivityPub::Activity::Accept do
           expect(DistributionWorker)
             .to have_enqueued_sidekiq_job(status.id, { 'update' => true })
           expect(ActivityPub::StatusUpdateDistributionWorker)
-            .to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
+            .to have_enqueued_sidekiq_job(status.id, { 'update_id' => be_a(String) })
         end
 
         context 'when approval_uri is missing' do

spec/workers/activitypub/status_update_distribution_worker_spec.rb

@@ -9,64 +9,36 @@ RSpec.describe ActivityPub::StatusUpdateDistributionWorker do
   let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com', domain: 'example.com') }
 
   describe '#perform' do
-    context 'with an explicitly edited status' 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
-        follower.follow!(status.account)
+        status.update(visibility: :public)
-
-        status.snapshot!
-        status.text = 'bar'
-        status.edited_at = Time.now.utc
-        status.snapshot!
-        status.save!
       end
 
-      context 'with public status' do
+      it 'delivers to followers' do
-        before do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
-          status.update(visibility: :public)
+          subject.perform(status.id)
-        end
-
-        it 'delivers to followers' do
-          expect { subject.perform(status.id) }
-            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
-        end
-      end
-
-      context 'with private status' do
-        before do
-          status.update(visibility: :private)
-        end
-
-        it 'delivers to followers' do
-          expect { subject.perform(status.id) }
-            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
         end
       end
     end
 
-    context 'with an implicitly edited status' do
+    context 'with private status' do
       before do
-        follower.follow!(status.account)
+        status.update(visibility: :private)
       end
 
-      context 'with public status' do
+      it 'delivers to followers' do
-        before do
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
-          status.update(visibility: :public)
+          subject.perform(status.id)
-        end
-
-        it 'delivers to followers' do
-          expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
-            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
-        end
-      end
-
-      context 'with private status' do
-        before do
-          status.update(visibility: :private)
-        end
-
-        it 'delivers to followers' do
-          expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
-            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
         end
       end
     end