1 files changed, 31 insertions, 13 deletions

diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 088f24eb180..362d754bca3 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -69,7 +69,9 @@ describe PipelineSerializer do
         let(:pagination) { { page: 1, per_page: 2 } }
 
         context 'when a single pipeline object is present in relation' do
-          before { create(:ci_empty_pipeline) }
+          before do
+            create(:ci_empty_pipeline)
+          end
 
           it 'serializes pipeline relation' do
             expect(subject.first).to have_key :id
@@ -77,7 +79,9 @@ describe PipelineSerializer do
         end
 
         context 'when a multiple pipeline objects are being serialized' do
-          before { create_list(:ci_empty_pipeline, 3) }
+          before do
+            create_list(:ci_empty_pipeline, 3)
+          end
 
           it 'serializes appropriate number of objects' do
             expect(subject.count).to be 2
@@ -96,29 +100,43 @@ describe PipelineSerializer do
 
     context 'number of queries' do
       let(:resource) { Ci::Pipeline.all }
-      let(:project) { create(:empty_project) }
+      let(:project) { create(:project) }
 
       before do
         Ci::Pipeline::AVAILABLE_STATUSES.each do |status|
           create_pipeline(status)
         end
+      end
 
-        RequestStore.begin!
+      shared_examples 'no N+1 queries' do
+        it 'verifies number of queries', :request_store do
+          recorded = ActiveRecord::QueryRecorder.new { subject }
+          expect(recorded.count).to be_within(1).of(59)
+          expect(recorded.cached_count).to eq(0)
+        end
       end
 
-      after do
-        RequestStore.end!
-        RequestStore.clear!
+      context 'with the same ref' do
+        let(:ref) { 'feature' }
+
+        it_behaves_like 'no N+1 queries'
       end
 
-      it "verifies number of queries" do
-        recorded = ActiveRecord::QueryRecorder.new { subject }
-        expect(recorded.count).to be_within(1).of(60)
-        expect(recorded.cached_count).to eq(0)
+      context 'with different refs' do
+        def ref
+          @sequence ||= 0
+          @sequence += 1
+          "feature-#{@sequence}"
+        end
+
+        it_behaves_like 'no N+1 queries'
       end
 
       def create_pipeline(status)
-        create(:ci_empty_pipeline, project: project, status: status).tap do |pipeline|
+        create(:ci_empty_pipeline,
+               project: project,
+               status: status,
+               ref: ref).tap do |pipeline|
           Ci::Build::AVAILABLE_STATUSES.each do |status|
             create_build(pipeline, status, status)
           end
@@ -128,7 +146,7 @@ describe PipelineSerializer do
       def create_build(pipeline, stage, status)
         create(:ci_build, :tags, :triggered, :artifacts,
           pipeline: pipeline, stage: stage,
-          name: stage, status: status)
+          name: stage, status: status, ref: pipeline.ref)
       end
     end
   end