Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 23 deletions

diff --git a/spec/controllers/projects/alert_management_controller_spec.rb b/spec/controllers/projects/alert_management_controller_spec.rb
index 31185aa948a..8fc2319ff88 100644
--- a/spec/controllers/projects/alert_management_controller_spec.rb
+++ b/spec/controllers/projects/alert_management_controller_spec.rb
@@ -14,32 +14,14 @@ describe Projects::AlertManagementController do
   end
 
   describe 'GET #index' do
-    context 'when alert_management_minimal is enabled' do
-      before do
-        stub_feature_flags(alert_management_minimal: true)
-      end
-
-      it 'shows the page' do
-        get :index, params: { namespace_id: project.namespace, project_id: project }
+    it 'shows the page' do
+      get :index, params: { namespace_id: project.namespace, project_id: project }
 
-        expect(response).to have_gitlab_http_status(:ok)
-      end
-
-      context 'when user is unauthorized' do
-        let(:role) { :reporter }
-
-        it 'shows 404' do
-          get :index, params: { namespace_id: project.namespace, project_id: project }
-
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
+      expect(response).to have_gitlab_http_status(:ok)
     end
 
-    context 'when alert_management_minimal is disabled' do
-      before do
-        stub_feature_flags(alert_management_minimal: false)
-      end
+    context 'when user is unauthorized' do
+      let(:role) { :reporter }
 
       it 'shows 404' do
         get :index, params: { namespace_id: project.namespace, project_id: project }