1 files changed, 9 insertions, 24 deletions

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 a7250e8ad0d..26fda877089 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
@@ -20,6 +20,7 @@ import {
   timelineEventsEditEventError,
   fakeDate,
   fakeEventData,
+  fakeEventSaveData,
   mockInputData,
 } from './mock_data';
 
@@ -92,9 +93,7 @@ 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,
-      );
+      expect(findItems().at(1).props('eventTags')).toBe(mockEvents[1].timelineEventTags.nodes);
     });
 
     it('formats dates correctly', () => {
@@ -123,20 +122,6 @@ 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 });
@@ -183,20 +168,20 @@ describe('IncidentTimelineEventList', () => {
     });
 
     const findEditEvent = () => wrapper.findComponent(EditTimelineEvent);
-    const mockSaveData = { ...fakeEventData, ...mockInputData };
+    const mockHandleSaveEventData = { ...fakeEventData, ...mockInputData };
 
     describe('editTimelineEvent', () => {
       it('should call the mutation with the right variables', async () => {
-        await findEditEvent().vm.$emit('handle-save-edit', mockSaveData);
+        await findEditEvent().vm.$emit('handle-save-edit', mockHandleSaveEventData);
         await waitForPromises();
 
         expect(editResponseSpy).toHaveBeenCalledWith({
-          input: mockSaveData,
+          input: fakeEventSaveData,
         });
       });
 
       it('should close the form on successful addition', async () => {
-        await findEditEvent().vm.$emit('handle-save-edit', mockSaveData);
+        await findEditEvent().vm.$emit('handle-save-edit', fakeEventSaveData);
         await waitForPromises();
 
         expect(findEditEvent().exists()).toBe(false);
@@ -217,7 +202,7 @@ describe('IncidentTimelineEventList', () => {
         };
         editResponseSpy.mockResolvedValueOnce(timelineEventsEditEventError);
 
-        await findEditEvent().vm.$emit('handle-save-edit', mockSaveData);
+        await findEditEvent().vm.$emit('handle-save-edit', fakeEventSaveData);
         await waitForPromises();
 
         expect(createAlert).toHaveBeenCalledWith(expectedAlertArgs);
@@ -231,7 +216,7 @@ describe('IncidentTimelineEventList', () => {
         };
         editResponseSpy.mockRejectedValueOnce();
 
-        await findEditEvent().vm.$emit('handle-save-edit', mockSaveData);
+        await findEditEvent().vm.$emit('handle-save-edit', fakeEventSaveData);
         await waitForPromises();
 
         expect(createAlert).toHaveBeenCalledWith(expectedAlertArgs);
@@ -240,7 +225,7 @@ describe('IncidentTimelineEventList', () => {
       it('should keep the form open on failed addition', async () => {
         editResponseSpy.mockResolvedValueOnce(timelineEventsEditEventError);
 
-        await findEditEvent().vm.$emit('handle-save-edit', mockSaveData);
+        await findEditEvent().vm.$emit('handle-save-edit', fakeEventSaveData);
         await waitForPromises();
 
         expect(findEditEvent().exists()).toBe(true);