1 files changed, 4 insertions, 2 deletions
diff --git a/spec/support/shared_examples/graphql/projects/merge_request_n_plus_one_query_examples.rb b/spec/support/shared_examples/graphql/projects/merge_request_n_plus_one_query_examples.rb
index 397e22ace28..738edd43c92 100644
--- a/spec/support/shared_examples/graphql/projects/merge_request_n_plus_one_query_examples.rb
+++ b/spec/support/shared_examples/graphql/projects/merge_request_n_plus_one_query_examples.rb
@@ -2,10 +2,12 @@
 shared_examples 'N+1 query check' do
   it 'prevents N+1 queries' do
     execute_query # "warm up" to prevent undeterministic counts
+    expect(graphql_errors).to be_blank # Sanity check - ex falso quodlibet!
 
-    control_count = ActiveRecord::QueryRecorder.new { execute_query }.count
+    control = ActiveRecord::QueryRecorder.new { execute_query }
+    expect(control.count).to be > 0
 
     search_params[:iids] << extra_iid_for_second_query
-    expect { execute_query }.not_to exceed_query_limit(control_count)
+    expect { execute_query }.not_to exceed_query_limit(control)
   end
 end