Merge branch 'fix-a-flaky-draft_notes_publish_service_spec' into 'master'

Fix a flaky spec caused by the use of let_it_be

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/150219



Merged-by: Patrick Bajao <ebajao@gitlab.com>
Approved-by: Patrick Bajao <ebajao@gitlab.com>
Co-authored-by: David Kim <dkim@gitlab.com>

spec/services/draft_notes/publish_service_spec.rb

@@ -185,16 +185,21 @@ def publish(draft: nil)
         end
       end
 
-      it 'does not request a lot from Gitaly', :request_store, :clean_gitlab_redis_cache do
-        merge_request
-        position
+      context 'checking gitaly calls' do
+        # NOTE: This was added to avoid test flakiness.
+        let(:merge_request) { create(:merge_request) }
 
-        Gitlab::GitalyClient.reset_counts
+        it 'does not request a lot from Gitaly', :request_store, :clean_gitlab_redis_cache do
+          merge_request
+          position
 
-        # NOTE: This should be reduced as we work on reducing Gitaly calls.
-        # Gitaly requests shouldn't go above this threshold as much as possible
-        # as it may add more to the Gitaly N+1 issue we are experiencing.
-        expect { publish }.to change { Gitlab::GitalyClient.get_request_count }.by(19)
+          Gitlab::GitalyClient.reset_counts
+
+          # NOTE: This should be reduced as we work on reducing Gitaly calls.
+          # Gitaly requests shouldn't go above this threshold as much as possible
+          # as it may add more to the Gitaly N+1 issue we are experiencing.
+          expect { publish }.to change { Gitlab::GitalyClient.get_request_count }.by(19)
+        end
       end
     end