Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 3 insertions, 21 deletions

diff --git a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
index 28a732fda82..2a6e44673e3 100644
--- a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
+++ b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb
@@ -64,13 +64,13 @@ RSpec.describe Ci::DailyBuildGroupReportResultsFinder do
       end
     end
 
-    context 'when ref_path is not present' do
+    context 'when ref_path query parameter is not present' do
       let(:ref_path) { nil }
 
-      context 'when coverages exist for the default branch' do
+      context 'when records with cover data from the default branch exist' do
         let(:default_branch) { true }
 
-        it 'returns coverage for the default branch' do
+        it 'returns records with default_branch:true, irrespective of ref_path' do
           rspec_coverage_4 = create_daily_coverage('rspec', 66.0, '2020-03-10')
 
           expect(coverages).to contain_exactly(rspec_coverage_4)
diff --git a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
index 64b3c46e122..65f6dc0ba74 100644
--- a/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
+++ b/spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
@@ -225,24 +225,6 @@ RSpec.describe Ci::PipelinesForMergeRequestFinder do
                     branch_pipeline_2,
                     branch_pipeline])
         end
-
-        context 'when ci_pipelines_for_merge_request_finder_new_cte feature flag is disabled' do
-          before do
-            stub_feature_flags(ci_pipelines_for_merge_request_finder_new_cte: false)
-          end
-
-          it 'returns only related merge request pipelines' do
-            expect(subject.all)
-              .to eq([detached_merge_request_pipeline,
-                      branch_pipeline_2,
-                      branch_pipeline])
-
-            expect(described_class.new(merge_request_2, nil).all)
-              .to eq([detached_merge_request_pipeline_2,
-                      branch_pipeline_2,
-                      branch_pipeline])
-          end
-        end
       end
 
       context 'when detached merge request pipeline is run on head ref of the merge request' do