Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 8 deletions

diff --git a/spec/services/incident_management/timeline_events/create_service_spec.rb b/spec/services/incident_management/timeline_events/create_service_spec.rb
index a3810879c65..fa5f4c64a43 100644
--- a/spec/services/incident_management/timeline_events/create_service_spec.rb
+++ b/spec/services/incident_management/timeline_events/create_service_spec.rb
@@ -171,7 +171,7 @@ RSpec.describe IncidentManagement::TimelineEvents::CreateService do
             occurred_at: Time.current,
             action: 'new comment',
             promoted_from_note: comment,
-            timeline_event_tag_names: ['start time', 'end time']
+            timeline_event_tag_names: ['start time', 'end time', 'Impact mitigated']
           }
         end
 
@@ -180,11 +180,11 @@ RSpec.describe IncidentManagement::TimelineEvents::CreateService do
         it 'matches the two tags on the event and creates on project' do
           result = execute.payload[:timeline_event]
 
-          expect(result.timeline_event_tags.count).to eq(2)
-          expect(result.timeline_event_tags.by_names(['Start time', 'End time']).pluck_names)
-            .to match_array(['Start time', 'End time'])
+          expect(result.timeline_event_tags.count).to eq(3)
+          expect(result.timeline_event_tags.by_names(['Start time', 'End time', 'Impact mitigated']).pluck_names)
+            .to match_array(['Start time', 'End time', 'Impact mitigated'])
           expect(project.incident_management_timeline_event_tags.pluck_names)
-            .to include('Start time', 'End time')
+            .to include('Start time', 'End time', 'Impact mitigated')
         end
       end
 
diff --git a/spec/services/incident_management/timeline_events/update_service_spec.rb b/spec/services/incident_management/timeline_events/update_service_spec.rb
index ff802109715..ebaa4dde7a2 100644
--- a/spec/services/incident_management/timeline_events/update_service_spec.rb
+++ b/spec/services/incident_management/timeline_events/update_service_spec.rb
@@ -201,20 +201,22 @@ RSpec.describe IncidentManagement::TimelineEvents::UpdateService, feature_catego
             {
               note: 'Updated note',
               occurred_at: occurred_at,
-              timeline_event_tag_names: ['start time', 'end time']
+              timeline_event_tag_names: ['start time', 'end time', 'response initiated']
             }
           end
 
           it 'returns the new tag in response' do
             timeline_event = execute.payload[:timeline_event]
 
-            expect(timeline_event.timeline_event_tags.pluck_names).to contain_exactly('Start time', 'End time')
+            expect(timeline_event.timeline_event_tags.pluck_names).to contain_exactly(
+              'Start time', 'End time', 'Response initiated')
           end
 
           it 'creates the predefined tags on the project' do
             execute
 
-            expect(project.incident_management_timeline_event_tags.pluck_names).to include('Start time', 'End time')
+            expect(project.incident_management_timeline_event_tags.pluck_names).to include(
+              'Start time', 'End time', 'Response initiated')
           end
         end