Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 22 deletions

diff --git a/spec/helpers/projects/alert_management_helper_spec.rb b/spec/helpers/projects/alert_management_helper_spec.rb
index f6d0c9ca49a..fd35c1ecab8 100644
--- a/spec/helpers/projects/alert_management_helper_spec.rb
+++ b/spec/helpers/projects/alert_management_helper_spec.rb
@@ -39,28 +39,6 @@ RSpec.describe Projects::AlertManagementHelper do
       end
     end
 
-    context 'with alerts service' do
-      let_it_be(:alerts_service) { create(:alerts_service, project: project) }
-
-      context 'when alerts service is active' do
-        it 'enables alert management' do
-          expect(data).to include(
-            'alert-management-enabled' => 'true'
-          )
-        end
-      end
-
-      context 'when alerts service is inactive' do
-        it 'disables alert management' do
-          alerts_service.update!(active: false)
-
-          expect(data).to include(
-            'alert-management-enabled' => 'false'
-          )
-        end
-      end
-    end
-
     context 'with prometheus service' do
       let_it_be(:prometheus_service) { create(:prometheus_service, project: project) }
 
@@ -105,6 +83,16 @@ RSpec.describe Projects::AlertManagementHelper do
       end
     end
 
+    context 'with an alert' do
+      let_it_be(:alert) { create(:alert_management_alert, project: project) }
+
+      it 'enables alert management' do
+        expect(data).to include(
+          'alert-management-enabled' => 'true'
+        )
+      end
+    end
+
     context 'when user does not have requisite enablement permissions' do
       let(:user_can_enable_alert_management) { false }