Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 16 insertions, 1 deletions

diff --git a/spec/finders/ci/pipelines_finder_spec.rb b/spec/finders/ci/pipelines_finder_spec.rb
index a2a714689ba..16561aa65b6 100644
--- a/spec/finders/ci/pipelines_finder_spec.rb
+++ b/spec/finders/ci/pipelines_finder_spec.rb
@@ -72,7 +72,7 @@ RSpec.describe Ci::PipelinesFinder do
         create(:ci_sources_pipeline, pipeline: child_pipeline, source_pipeline: parent_pipeline)
       end
 
-      it 'filters out child pipelines and show only the parents' do
+      it 'filters out child pipelines and shows only the parents by default' do
         is_expected.to eq([parent_pipeline])
       end
     end
@@ -195,6 +195,21 @@ RSpec.describe Ci::PipelinesFinder do
       end
     end
 
+    context 'when iids filter is specified' do
+      let(:params) { { iids: [pipeline1.iid, pipeline3.iid] } }
+      let!(:pipeline1) { create(:ci_pipeline, project: project) }
+      let!(:pipeline2) { create(:ci_pipeline, project: project) }
+      let!(:pipeline3) { create(:ci_pipeline, project: project, source: :parent_pipeline) }
+
+      it 'returns matches pipelines' do
+        is_expected.to match_array([pipeline1, pipeline3])
+      end
+
+      it 'does not fitler out child pipelines' do
+        is_expected.to include(pipeline3)
+      end
+    end
+
     context 'when sha is specified' do
       let!(:pipeline) { create(:ci_pipeline, project: project, sha: '97de212e80737a608d939f648d959671fb0a0142') }