Add latest changes from gitlab-org/gitlab@master

2 files changed, 32 insertions, 0 deletions

diff --git a/spec/finders/packages/group_packages_finder_spec.rb b/spec/finders/packages/group_packages_finder_spec.rb
index c2dbfb59eb2..954db6481cd 100644
--- a/spec/finders/packages/group_packages_finder_spec.rb
+++ b/spec/finders/packages/group_packages_finder_spec.rb
@@ -149,6 +149,22 @@ RSpec.describe Packages::GroupPackagesFinder do
         it { is_expected.to match_array([package1, package2]) }
       end
 
+      context 'preload_pipelines' do
+        it 'preloads pipelines by default' do
+          expect(Packages::Package).to receive(:preload_pipelines).and_call_original
+          expect(subject).to match_array([package1, package2])
+        end
+
+        context 'set to false' do
+          let(:params) { { preload_pipelines: false } }
+
+          it 'does not preload pipelines' do
+            expect(Packages::Package).not_to receive(:preload_pipelines)
+            expect(subject).to match_array([package1, package2])
+          end
+        end
+      end
+
       context 'with package_name' do
         let_it_be(:named_package) { create(:maven_package, project: project, name: 'maven') }
 
diff --git a/spec/finders/packages/packages_finder_spec.rb b/spec/finders/packages/packages_finder_spec.rb
index b72f4aab3ec..6cea0a44541 100644
--- a/spec/finders/packages/packages_finder_spec.rb
+++ b/spec/finders/packages/packages_finder_spec.rb
@@ -81,6 +81,22 @@ RSpec.describe ::Packages::PackagesFinder do
       it { is_expected.to match_array([conan_package, maven_package]) }
     end
 
+    context 'preload_pipelines' do
+      it 'preloads pipelines by default' do
+        expect(Packages::Package).to receive(:preload_pipelines).and_call_original
+        expect(subject).to match_array([maven_package, conan_package])
+      end
+
+      context 'set to false' do
+        let(:params) { { preload_pipelines: false } }
+
+        it 'does not preload pipelines' do
+          expect(Packages::Package).not_to receive(:preload_pipelines)
+          expect(subject).to match_array([maven_package, conan_package])
+        end
+      end
+    end
+
     it_behaves_like 'concerning versionless param'
     it_behaves_like 'concerning package statuses'
   end