Add latest changes from gitlab-org/gitlab@13-4-stable-ee

4 files changed, 9 insertions, 0 deletions

diff --git a/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb b/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
index f8b61c5064a..31abbabe385 100644
--- a/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
+++ b/spec/graphql/mutations/alert_management/alerts/set_assignees_spec.rb
@@ -55,6 +55,7 @@ RSpec.describe Mutations::AlertManagement::Alerts::SetAssignees do
 
     context 'when operation mode is not specified' do
       it_behaves_like 'successful resolution'
+      it_behaves_like 'an incident management tracked event', :incident_management_alert_assigned
     end
 
     context 'when user does not have permission to update alerts' do
diff --git a/spec/graphql/mutations/alert_management/alerts/todo/create_spec.rb b/spec/graphql/mutations/alert_management/alerts/todo/create_spec.rb
index 11ee40a4c7e..a10c3725ba2 100644
--- a/spec/graphql/mutations/alert_management/alerts/todo/create_spec.rb
+++ b/spec/graphql/mutations/alert_management/alerts/todo/create_spec.rb
@@ -16,6 +16,8 @@ RSpec.describe Mutations::AlertManagement::Alerts::Todo::Create do
   describe '#resolve' do
     subject(:resolve) { mutation.resolve(args) }
 
+    it_behaves_like 'an incident management tracked event', :incident_management_alert_todo
+
     context 'when user does not have permissions' do
       let(:current_user) { nil }
 
diff --git a/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb b/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
index fa5a84b4fcc..e6a7434d579 100644
--- a/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
+++ b/spec/graphql/mutations/alert_management/create_alert_issue_spec.rb
@@ -26,6 +26,8 @@ RSpec.describe Mutations::AlertManagement::CreateAlertIssue do
             errors: []
           )
         end
+
+        it_behaves_like 'an incident management tracked event', :incident_management_incident_created
       end
 
       context 'when CreateAlertIssue responds with an error' do
diff --git a/spec/graphql/mutations/alert_management/update_alert_status_spec.rb b/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
index a224b564de9..ab98088ebcd 100644
--- a/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
+++ b/spec/graphql/mutations/alert_management/update_alert_status_spec.rb
@@ -30,6 +30,10 @@ RSpec.describe Mutations::AlertManagement::UpdateAlertStatus do
         )
       end
 
+      it_behaves_like 'an incident management tracked event', :incident_management_alert_status_changed do
+        let(:user) { current_user }
+      end
+
       context 'error occurs when updating' do
         it 'returns the alert with errors' do
           # Stub an error on the alert