Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 0 deletions

diff --git a/spec/frontend/issues/show/components/incidents/mock_data.js b/spec/frontend/issues/show/components/incidents/mock_data.js
index adea2b6df59..9accfcea791 100644
--- a/spec/frontend/issues/show/components/incidents/mock_data.js
+++ b/spec/frontend/issues/show/components/incidents/mock_data.js
@@ -13,6 +13,9 @@ export const mockEvents = [
     noteHtml: '<p>Dummy event 1</p>',
     occurredAt: '2022-03-22T15:59:00Z',
     updatedAt: '2022-03-22T15:59:08Z',
+    timelineEventTags: {
+      nodes: [],
+    },
     __typename: 'TimelineEventType',
   },
   {
@@ -29,6 +32,18 @@ export const mockEvents = [
     noteHtml: '<p>Dummy event 2</p>',
     occurredAt: '2022-03-23T14:57:00Z',
     updatedAt: '2022-03-23T14:57:08Z',
+    timelineEventTags: {
+      nodes: [
+        {
+          id: 'gid://gitlab/IncidentManagement::TimelineEvent/132',
+          name: 'Start time',
+        },
+        {
+          id: 'gid://gitlab/IncidentManagement::TimelineEvent/132',
+          name: 'End time',
+        },
+      ],
+    },
     __typename: 'TimelineEventType',
   },
   {
@@ -45,6 +60,9 @@ export const mockEvents = [
     noteHtml: '<p>Dummy event 3</p>',
     occurredAt: '2022-03-23T15:59:00Z',
     updatedAt: '2022-03-23T15:59:08Z',
+    timelineEventTags: {
+      nodes: [],
+    },
     __typename: 'TimelineEventType',
   },
 ];
@@ -152,6 +170,9 @@ export const mockGetTimelineData = {
           action: 'comment',
           occurredAt: '2022-07-01T12:47:00Z',
           createdAt: '2022-07-20T12:47:40Z',
+          timelineEventTags: {
+            nodes: [],
+          },
         },
       ],
     },
diff --git a/spec/frontend/issues/show/components/incidents/timeline_events_list_spec.js b/spec/frontend/issues/show/components/incidents/timeline_events_list_spec.js
index dff1c429d07..a7250e8ad0d 100644
--- a/spec/frontend/issues/show/components/incidents/timeline_events_list_spec.js
+++ b/spec/frontend/issues/show/components/incidents/timeline_events_list_spec.js
@@ -92,6 +92,9 @@ describe('IncidentTimelineEventList', () => {
       expect(findItems().at(1).props('occurredAt')).toBe(mockEvents[1].occurredAt);
       expect(findItems().at(1).props('action')).toBe(mockEvents[1].action);
       expect(findItems().at(1).props('noteHtml')).toBe(mockEvents[1].noteHtml);
+      expect(findItems().at(1).props('eventTag')).toBe(
+        mockEvents[1].timelineEventTags.nodes[0].name,
+      );
     });
 
     it('formats dates correctly', () => {
@@ -120,6 +123,20 @@ describe('IncidentTimelineEventList', () => {
       });
     });
 
+    describe('getFirstTag', () => {
+      it('returns undefined, when timelineEventTags contains an empty array', () => {
+        const returnedTag = wrapper.vm.getFirstTag(mockEvents[0].timelineEventTags);
+
+        expect(returnedTag).toEqual(undefined);
+      });
+
+      it('returns the first string, when timelineEventTags contains array with at least one tag', () => {
+        const returnedTag = wrapper.vm.getFirstTag(mockEvents[1].timelineEventTags);
+
+        expect(returnedTag).toBe(mockEvents[1].timelineEventTags.nodes[0].name);
+      });
+    });
+
     describe('delete functionality', () => {
       beforeEach(() => {
         mockConfirmAction({ confirmed: true });