Merge remote-tracking branch 'parent/main' into upstream-20231225

spec/services/activitypub/fetch_featured_collection_service_spec.rb

@@ -87,6 +87,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
         'https://example.com/account/pinned/unknown-inlined',
         'https://example.com/account/pinned/unknown-reachable'
       )
+      expect(actor.pinned_statuses).to_not include(known_status)
     end
   end
 

spec/services/activitypub/fetch_remote_status_service_spec.rb

@@ -8,7 +8,6 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
   subject { described_class.new }
 
   let!(:sender) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar') }
-  let!(:recipient) { Fabricate(:account) }
 
   let(:existing_status) { nil }
 

spec/services/activitypub/process_account_service_spec.rb

@@ -283,7 +283,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
   end
 
   context 'when account is not suspended' do
-    subject { described_class.new.call('alice', 'example.com', payload) }
+    subject { described_class.new.call(account.username, account.domain, payload) }
 
     let!(:account) { Fabricate(:account, username: 'alice', domain: 'example.com') }
 

spec/services/activitypub/process_collection_service_spec.rb

@@ -242,7 +242,8 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
         it 'does not process forged payload' do
           allow(ActivityPub::Activity).to receive(:factory)
 
-          subject.call(json, forwarder)
+          expect { subject.call(json, forwarder) }
+            .to_not change(actor.reload.statuses, :count)
 
           expect(ActivityPub::Activity).to_not have_received(:factory).with(
             hash_including(