1 files changed, 25 insertions, 1 deletions
diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb
index a10893e502f..0afc8c300f9 100644
--- a/spec/services/issues/referenced_merge_requests_service_spec.rb
+++ b/spec/services/issues/referenced_merge_requests_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper.rb'
 describe Issues::ReferencedMergeRequestsService do
   def create_referencing_mr(attributes = {})
     create(:merge_request, attributes).tap do |merge_request|
-      create(:note, :system, project: project, noteable: issue, note: merge_request.to_reference(full: true))
+      create(:note, :system, project: project, noteable: issue, author: user, note: merge_request.to_reference(full: true))
     end
   end
 
@@ -54,6 +54,18 @@ describe Issues::ReferencedMergeRequestsService do
       expect(service.referenced_merge_requests(issue)).not_to include(closing_mr_other_project)
       expect(service.referenced_merge_requests(issue)).not_to include(referencing_mr_other_project)
     end
+
+    context 'performance' do
+      it 'does not run a query for each note author', :use_clean_rails_memory_store_caching do
+        service.referenced_merge_requests(issue) # warm cache
+        control_count = ActiveRecord::QueryRecorder.new { service.referenced_merge_requests(issue) }.count
+
+        create(:note, project: project, noteable: issue, author: create(:user))
+        service.referenced_merge_requests(issue) # warm cache
+
+        expect { service.referenced_merge_requests(issue) }.not_to exceed_query_limit(control_count)
+      end
+    end
   end
 
   describe '#closed_by_merge_requests' do
@@ -68,5 +80,17 @@ describe Issues::ReferencedMergeRequestsService do
     it 'returns an empty array when the current issue is closed already' do
       expect(service.closed_by_merge_requests(closed_issue)).to eq([])
     end
+
+    context 'performance' do
+      it 'does not run a query for each note author', :use_clean_rails_memory_store_caching do
+        service.closed_by_merge_requests(issue) # warm cache
+        control_count = ActiveRecord::QueryRecorder.new { service.closed_by_merge_requests(issue) }.count
+
+        create(:note, :system, project: project, noteable: issue, author: create(:user))
+        service.closed_by_merge_requests(issue) # warm cache
+
+        expect { service.closed_by_merge_requests(issue) }.not_to exceed_query_limit(control_count)
+      end
+    end
   end
 end