1 files changed, 6 insertions, 17 deletions
diff --git a/spec/requests/projects/merge_requests_discussions_spec.rb b/spec/requests/projects/merge_requests_discussions_spec.rb
index 644f26af006..24b6fb2f640 100644
--- a/spec/requests/projects/merge_requests_discussions_spec.rb
+++ b/spec/requests/projects/merge_requests_discussions_spec.rb
@@ -27,19 +27,15 @@ RSpec.describe 'merge requests discussions', feature_category: :source_code_mana
     end
     # rubocop:enable RSpec/InstanceVariable
 
-    shared_examples 'N+1 queries' do
-      it 'avoids N+1 DB queries', :request_store do
-        send_request # warm up
+    it 'avoids N+1 DB queries', :request_store do
+      send_request # warm up
 
-        create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.project)
-        control = ActiveRecord::QueryRecorder.new { send_request }
+      create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.project)
+      control = ActiveRecord::QueryRecorder.new { send_request }
 
-        create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.project)
+      create(:diff_note_on_merge_request, noteable: merge_request, project: merge_request.project)
 
-        expect do
-          send_request
-        end.not_to exceed_query_limit(control).with_threshold(notes_metadata_threshold)
-      end
+      expect { send_request }.not_to exceed_query_limit(control)
     end
 
     it 'returns 200' do
@@ -48,13 +44,6 @@ RSpec.describe 'merge requests discussions', feature_category: :source_code_mana
       expect(response).to have_gitlab_http_status(:ok)
     end
 
-    # https://docs.gitlab.com/ee/development/query_recorder.html#use-request-specs-instead-of-controller-specs
-    context 'with notes_metadata_threshold' do
-      let(:notes_metadata_threshold) { 1 }
-
-      it_behaves_like 'N+1 queries'
-    end
-
     it 'limits Gitaly queries', :request_store do
       Gitlab::GitalyClient.allow_n_plus_1_calls do
         create_list(:diff_note_on_merge_request, 7, noteable: merge_request, project: merge_request.project)