From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- .../ci/pipelines_for_merge_request_finder_spec.rb | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb') 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 -- cgit v1.2.1