Merge commit '389a6cc4c0' into upstream-20231108

spec/workers/activitypub/distribute_poll_update_worker_spec.rb

@@ -16,8 +16,9 @@ describe ActivityPub::DistributePollUpdateWorker do
     end
 
     it 'delivers to followers' do
-      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com']])
-      subject.perform(status.id)
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com']]) do
+        subject.perform(status.id)
+      end
     end
   end
 end

spec/workers/activitypub/distribution_worker_spec.rb

@@ -19,8 +19,9 @@ describe ActivityPub::DistributionWorker do
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
-        subject.perform(status.id)
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
       end
     end
 
@@ -30,8 +31,9 @@ describe ActivityPub::DistributionWorker do
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
-        subject.perform(status.id)
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
       end
     end
 
@@ -44,8 +46,9 @@ describe ActivityPub::DistributionWorker do
       end
 
       it 'delivers to mentioned accounts' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'https://foo.bar/inbox', anything]])
-        subject.perform(status.id)
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'https://foo.bar/inbox', anything]]) do
+          subject.perform(status.id)
+        end
       end
     end
   end

spec/workers/activitypub/move_distribution_worker_spec.rb

@@ -19,8 +19,9 @@ describe ActivityPub::MoveDistributionWorker do
       expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [
                                   [kind_of(String), migration.account.id, 'http://example.com'],
                                   [kind_of(String), migration.account.id, 'http://example2.com'],
-                                ])
-      subject.perform(migration.id)
+                                ]) do
+        subject.perform(migration.id)
+      end
     end
   end
 end

spec/workers/activitypub/status_update_distribution_worker_spec.rb

@@ -25,9 +25,9 @@ describe ActivityPub::StatusUpdateDistributionWorker do
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
-
-        subject.perform(status.id)
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
       end
     end
 
@@ -37,9 +37,9 @@ describe ActivityPub::StatusUpdateDistributionWorker do
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]])
-
-        subject.perform(status.id)
+        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
+          subject.perform(status.id)
+        end
       end
     end
   end

spec/workers/activitypub/update_distribution_worker_spec.rb

@@ -14,8 +14,9 @@ describe ActivityPub::UpdateDistributionWorker do
     end
 
     it 'delivers to followers' do
-      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com', anything]])
-      subject.perform(account.id)
+      expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), account.id, 'http://example.com', anything]]) do
+        subject.perform(account.id)
+      end
     end
   end
 end