2 files changed, 14 insertions, 51 deletions
diff --git a/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb b/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
index 81318b49cd9..3c4376909f8 100644
--- a/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
+++ b/spec/controllers/projects/ci/daily_build_group_report_results_controller_spec.rb
@@ -4,29 +4,25 @@ require 'spec_helper'
 
 RSpec.describe Projects::Ci::DailyBuildGroupReportResultsController do
   describe 'GET index' do
-    let(:project) { create(:project, :public, :repository) }
-    let(:ref_path) { 'refs/heads/master' }
-    let(:param_type) { 'coverage' }
-    let(:start_date) { '2019-12-10' }
-    let(:end_date) { '2020-03-09' }
-    let(:allowed_to_read) { true }
-    let(:user) { create(:user) }
-    let(:feature_enabled?) { true }
+    let_it_be(:project) { create(:project, :public, :repository) }
+    let_it_be(:ref_path) { 'refs/heads/master' }
+    let_it_be(:param_type) { 'coverage' }
+    let_it_be(:start_date) { '2019-12-10' }
+    let_it_be(:end_date) { '2020-03-09' }
+    let_it_be(:allowed_to_read) { true }
+    let_it_be(:user) { create(:user) }
+    let_it_be(:rspec_coverage_1) { create_daily_coverage('rspec', 79.0, '2020-03-09') }
+    let_it_be(:rspec_coverage_2) { create_daily_coverage('rspec', 77.0, '2020-03-08') }
+    let_it_be(:karma_coverage) { create_daily_coverage('karma', 81.0, '2019-12-10') }
+    let_it_be(:minitest_coverage) { create_daily_coverage('minitest', 67.0, '2019-12-09') }
+    let_it_be(:mocha_coverage) { create_daily_coverage('mocha', 71.0, '2019-12-09') }
 
     before do
-      create_daily_coverage('rspec', 79.0, '2020-03-09')
-      create_daily_coverage('rspec', 77.0, '2020-03-08')
-      create_daily_coverage('karma', 81.0, '2019-12-10')
-      create_daily_coverage('minitest', 67.0, '2019-12-09')
-      create_daily_coverage('mocha', 71.0, '2019-12-09')
-
       sign_in(user)
 
       allow(Ability).to receive(:allowed?).and_call_original
       allow(Ability).to receive(:allowed?).with(user, :read_build_report_results, project).and_return(allowed_to_read)
 
-      stub_feature_flags(coverage_data_new_finder: feature_enabled?)
-
       get :index, params: {
         namespace_id: project.namespace,
         project_id: project,
@@ -140,33 +136,13 @@ RSpec.describe Projects::Ci::DailyBuildGroupReportResultsController do
     context 'when format is JSON' do
       let(:format) { :json }
 
-      context 'when coverage_data_new_finder flag is enabled' do
-        let(:feature_enabled?) { true }
-
-        it_behaves_like 'JSON results'
-      end
-
-      context 'when coverage_data_new_finder flag is disabled' do
-        let(:feature_enabled?) { false }
-
-        it_behaves_like 'JSON results'
-      end
+      it_behaves_like 'JSON results'
     end
 
     context 'when format is CSV' do
       let(:format) { :csv }
 
-      context 'when coverage_data_new_finder flag is enabled' do
-        let(:feature_enabled?) { true }
-
-        it_behaves_like 'CSV results'
-      end
-
-      context 'when coverage_data_new_finder flag is disabled' do
-        let(:feature_enabled?) { false }
-
-        it_behaves_like 'CSV results'
-      end
+      it_behaves_like 'CSV results'
     end
   end
 
diff --git a/spec/controllers/projects/ci/pipeline_editor_controller_spec.rb b/spec/controllers/projects/ci/pipeline_editor_controller_spec.rb
index 1bf6ff95c44..942402a6d00 100644
--- a/spec/controllers/projects/ci/pipeline_editor_controller_spec.rb
+++ b/spec/controllers/projects/ci/pipeline_editor_controller_spec.rb
@@ -36,18 +36,5 @@ RSpec.describe Projects::Ci::PipelineEditorController do
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
-
-    context 'when ci_pipeline_editor_page feature flag is disabled' do
-      before do
-        stub_feature_flags(ci_pipeline_editor_page: false)
-        project.add_developer(user)
-
-        get :show, params: { namespace_id: project.namespace, project_id: project }
-      end
-
-      it 'responds with 404' do
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
   end
 end