Fix test

Author: kmycode

spec/models/account/avatar_spec.rb

@@ -29,7 +29,7 @@
   describe 'convertable avatars', :attachment_processing do
     describe 'with AVIF' do
       it 'creates a jpeg static style' do
-        account = Fabricate(fabricator, avatar: attachment_fixture('avatar.avif'))
+        account = Fabricate(:account, avatar: attachment_fixture('avatar.avif'))
         expect(account.avatar_original_url.end_with?('.jpeg')).to be true
       end
     end

spec/models/account/search_spec.rb

@@ -203,7 +203,7 @@
         )
         match.follow!(account)
 
-        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
+        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
         expect(results).to eq [match]
       end
 
@@ -215,7 +215,7 @@
           domain: 'example.com'
         )
 
-        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
+        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, follower: true)
         expect(results).to eq []
       end
     end

spec/workers/activitypub/distribution_worker_spec.rb

@@ -32,9 +32,10 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
-          subject.perform(status.id)
-        end
+        subject.perform(status.id)
+
+        expect(ActivityPub::DeliveryWorker)
+          .to have_enqueued_sidekiq_job(match_json_values(type: 'Create'), status.account.id, 'http://example.com', anything)
       end
     end
 
@@ -59,9 +60,10 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com/follower/inbox', anything]]) do
-          subject.perform(status.id)
-        end
+        subject.perform(status.id)
+
+        expect(ActivityPub::DeliveryWorker)
+          .to have_enqueued_sidekiq_job(match_json_values(type: 'Create'), status.account.id, 'http://example.com/follower/inbox', anything)
       end
     end
 
@@ -91,9 +93,10 @@
       end
 
       it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com/no_follower/inbox', anything]]) do
-          subject.perform(status.id)
-        end
+        subject.perform(status.id)
+
+        expect(ActivityPub::DeliveryWorker)
+          .to have_enqueued_sidekiq_job(match_json_values(type: 'Create'), status.account.id, 'http://example.com/no_follower/inbox', anything)
       end
     end
 

spec/workers/activitypub/status_update_distribution_worker_spec.rb

@@ -61,9 +61,8 @@
         end
 
         it 'delivers to followers' do
-          expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[kind_of(String), status.account.id, 'http://example.com', anything]]) do
-            subject.perform(status.id)
-          end
+          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