Merge branch '56213-remove-error_tracking-feature-flag' into 'master'

Resolve "Remove `error_tracking` feature flag"

Closes #56213

See merge request gitlab-org/gitlab-ce!24306

4 files changed, 4 insertions, 58 deletions

diff --git a/spec/controllers/projects/error_tracking_controller_spec.rb b/spec/controllers/projects/error_tracking_controller_spec.rb
index 729e71b87a6..6464398cea1 100644
--- a/spec/controllers/projects/error_tracking_controller_spec.rb
+++ b/spec/controllers/projects/error_tracking_controller_spec.rb
@@ -20,18 +20,6 @@ describe Projects::ErrorTrackingController do
         expect(response).to render_template(:index)
       end
 
-      context 'with feature flag disabled' do
-        before do
-          stub_feature_flags(error_tracking: false)
-        end
-
-        it 'returns 404' do
-          get :index, params: project_params
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
-
       context 'with insufficient permissions' do
         before do
           project.add_guest(user)
diff --git a/spec/controllers/projects/settings/operations_controller_spec.rb b/spec/controllers/projects/settings/operations_controller_spec.rb
index 810f5bb64ba..d989ec22481 100644
--- a/spec/controllers/projects/settings/operations_controller_spec.rb
+++ b/spec/controllers/projects/settings/operations_controller_spec.rb
@@ -41,18 +41,6 @@ describe Projects::Settings::OperationsController do
         end
       end
 
-      context 'with feature flag disabled' do
-        before do
-          stub_feature_flags(error_tracking: false)
-        end
-
-        it 'renders 404' do
-          get :show, params: project_params(project)
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
-
       context 'with insufficient permissions' do
         before do
           project.add_reporter(user)
@@ -121,18 +109,6 @@ describe Projects::Settings::OperationsController do
         end
       end
 
-      context 'with feature flag disabled' do
-        before do
-          stub_feature_flags(error_tracking: false)
-        end
-
-        it 'renders 404' do
-          patch :update, params: project_params(project)
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
-
       context 'with insufficient permissions' do
         before do
           project.add_reporter(user)
diff --git a/spec/features/projects/settings/operations_settings_spec.rb b/spec/features/projects/settings/operations_settings_spec.rb
index 1f2328a6dd8..06290c67c70 100644
--- a/spec/features/projects/settings/operations_settings_spec.rb
+++ b/spec/features/projects/settings/operations_settings_spec.rb
@@ -8,32 +8,16 @@ describe 'Projects > Settings > For a forked project', :js do
   let(:role) { :maintainer }
 
   before do
-    stub_feature_flags(error_tracking: true)
     sign_in(user)
     project.add_role(user, role)
   end
 
   describe 'Sidebar > Operations' do
-    context 'when sidebar feature flag enabled' do
-      it 'renders the settings link in the sidebar' do
-        visit project_path(project)
-        wait_for_requests
+    it 'renders the settings link in the sidebar' do
+      visit project_path(project)
+      wait_for_requests
 
-        expect(page).to have_selector('a[title="Operations"]', visible: false)
-      end
-    end
-
-    context 'when sidebar feature flag disabled' do
-      before do
-        stub_feature_flags(error_tracking: false)
-      end
-
-      it 'does not render the settings link in the sidebar' do
-        visit project_path(project)
-        wait_for_requests
-
-        expect(page).not_to have_selector('a[title="Operations"]', visible: false)
-      end
+      expect(page).to have_selector('a[title="Operations"]', visible: false)
     end
   end
 end
diff --git a/spec/views/projects/settings/operations/show.html.haml_spec.rb b/spec/views/projects/settings/operations/show.html.haml_spec.rb
index 752fd82c5e8..8e34521c7c8 100644
--- a/spec/views/projects/settings/operations/show.html.haml_spec.rb
+++ b/spec/views/projects/settings/operations/show.html.haml_spec.rb
@@ -13,8 +13,6 @@ describe 'projects/settings/operations/show' do
 
   describe 'Operations > Error Tracking' do
     before do
-      stub_feature_flags(error_tracking: true)
-
       project.add_reporter(user)
 
       allow(view).to receive(:error_tracking_setting)