Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

2 files changed, 19 insertions, 22 deletions

diff --git a/spec/support/shared_examples/serializers/environment_serializer_shared_examples.rb b/spec/support/shared_examples/serializers/environment_serializer_shared_examples.rb
index 00146335ef7..9d7ae6bcb3d 100644
--- a/spec/support/shared_examples/serializers/environment_serializer_shared_examples.rb
+++ b/spec/support/shared_examples/serializers/environment_serializer_shared_examples.rb
@@ -20,9 +20,27 @@ RSpec.shared_examples 'avoid N+1 on environments serialization' do
     expect { serialize(grouping: false) }.not_to exceed_query_limit(control.count)
   end
 
-  def serialize(grouping:)
+  it 'does not preload for environments that does not exist in the page', :request_store do
+    create_environment_with_associations(project)
+
+    first_page_query = ActiveRecord::QueryRecorder.new do
+      serialize(grouping: false, query: { page: 1, per_page: 1 } )
+    end
+
+    second_page_query = ActiveRecord::QueryRecorder.new do
+      serialize(grouping: false, query: { page: 2, per_page: 1 } )
+    end
+
+    expect(second_page_query.count).to be < first_page_query.count
+  end
+
+  def serialize(grouping:, query: nil)
+    query ||= { page: 1, per_page: 1 }
+    request = double(url: "#{Gitlab.config.gitlab.url}:8080/api/v4/projects?#{query.to_query}", query_parameters: query)
+
     EnvironmentSerializer.new(current_user: user, project: project).yield_self do |serializer|
       serializer.within_folders if grouping
+      serializer.with_pagination(request, spy('response'))
       serializer.represent(Environment.where(project: project))
     end
   end
diff --git a/spec/support/shared_examples/serializers/pipeline_artifacts_shared_example.rb b/spec/support/shared_examples/serializers/pipeline_artifacts_shared_example.rb
deleted file mode 100644
index d5ffd5e7510..00000000000
--- a/spec/support/shared_examples/serializers/pipeline_artifacts_shared_example.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-RSpec.shared_examples 'public artifacts' do
-  let_it_be(:project) { create(:project, :public) }
-  let(:pipeline) { create(:ci_empty_pipeline, status: :success, project: project) }
-
-  context 'that has artifacts' do
-    let!(:build) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
-
-    it 'contains information about artifacts' do
-      expect(subject[:details][:artifacts].length).to eq(1)
-    end
-  end
-
-  context 'that has non public artifacts' do
-    let!(:build) { create(:ci_build, :success, :artifacts, :non_public_artifacts, pipeline: pipeline) }
-
-    it 'does not contain information about artifacts' do
-      expect(subject[:details][:artifacts].length).to eq(0)
-    end
-  end
-end