From 81877e79505f387284c7a9de88f631eab758a319 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jul 2024 03:24:14 -0400
Subject: [PATCH] Reduce extra round trips in `AP::FetchRemoteStatusService`
 spec (#31045)

---
 .../fetch_remote_status_service_spec.rb       | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index c3adb9c470..635fcb7976 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -227,7 +227,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
 
   context 'with statuses referencing other statuses', :inline_jobs do
     before do
-      stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 5
+      stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 3
     end
 
     context 'when using inReplyTo' do
@@ -243,7 +243,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
       end
 
       before do
-        8.times do |i|
+        5.times do |i|
           status_json = {
             '@context': 'https://www.w3.org/ns/activitystreams',
             id: "https://foo.bar/@foo/#{i}",
@@ -257,12 +257,10 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
         end
       end
 
-      it 'creates at least some statuses' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_least(2)
-      end
-
-      it 'creates no more account than the limit allows' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_most(5)
+      it 'creates statuses but not more than limit allows' do
+        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }
+          .to change { sender.statuses.count }.by_at_least(2)
+          .and change { sender.statuses.count }.by_at_most(3)
       end
     end
 
@@ -287,7 +285,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
       end
 
       before do
-        8.times do |i|
+        5.times do |i|
           status_json = {
             '@context': 'https://www.w3.org/ns/activitystreams',
             id: "https://foo.bar/@foo/#{i}",
@@ -309,12 +307,10 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
         end
       end
 
-      it 'creates at least some statuses' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_least(2)
-      end
-
-      it 'creates no more account than the limit allows' do
-        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }.to change { sender.statuses.count }.by_at_most(5)
+      it 'creates statuses but not more than limit allows' do
+        expect { subject.call(object[:id], prefetched_body: Oj.dump(object)) }
+          .to change { sender.statuses.count }.by_at_least(2)
+          .and change { sender.statuses.count }.by_at_most(3)
       end
     end
   end