Add latest changes from gitlab-org/gitlab@master

3 files changed, 64 insertions, 64 deletions

diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index 35608e7f7b4..912778a1546 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -53,7 +53,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setNotesData', () => {
-    it('should set received notes data', done => {
+    it('should set received notes data', (done) => {
       testAction(
         actions.setNotesData,
         notesDataMock,
@@ -66,7 +66,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setNoteableData', () => {
-    it('should set received issue data', done => {
+    it('should set received issue data', (done) => {
       testAction(
         actions.setNoteableData,
         noteableDataMock,
@@ -79,7 +79,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setUserData', () => {
-    it('should set received user data', done => {
+    it('should set received user data', (done) => {
       testAction(
         actions.setUserData,
         userDataMock,
@@ -92,7 +92,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setLastFetchedAt', () => {
-    it('should set received timestamp', done => {
+    it('should set received timestamp', (done) => {
       testAction(
         actions.setLastFetchedAt,
         'timestamp',
@@ -105,7 +105,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setInitialNotes', () => {
-    it('should set initial notes', done => {
+    it('should set initial notes', (done) => {
       testAction(
         actions.setInitialNotes,
         [individualNote],
@@ -118,7 +118,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setTargetNoteHash', () => {
-    it('should set target note hash', done => {
+    it('should set target note hash', (done) => {
       testAction(
         actions.setTargetNoteHash,
         'hash',
@@ -131,7 +131,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('toggleDiscussion', () => {
-    it('should toggle discussion', done => {
+    it('should toggle discussion', (done) => {
       testAction(
         actions.toggleDiscussion,
         { discussionId: discussionMock.id },
@@ -144,7 +144,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('expandDiscussion', () => {
-    it('should expand discussion', done => {
+    it('should expand discussion', (done) => {
       testAction(
         actions.expandDiscussion,
         { discussionId: discussionMock.id },
@@ -157,7 +157,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('collapseDiscussion', () => {
-    it('should commit collapse discussion', done => {
+    it('should commit collapse discussion', (done) => {
       testAction(
         actions.collapseDiscussion,
         { discussionId: discussionMock.id },
@@ -175,7 +175,7 @@ describe('Actions Notes Store', () => {
     });
 
     describe('closeMergeRequest', () => {
-      it('sets state as closed', done => {
+      it('sets state as closed', (done) => {
         store
           .dispatch('closeIssuable', { notesData: { closeIssuePath: '' } })
           .then(() => {
@@ -188,7 +188,7 @@ describe('Actions Notes Store', () => {
     });
 
     describe('reopenMergeRequest', () => {
-      it('sets state as reopened', done => {
+      it('sets state as reopened', (done) => {
         store
           .dispatch('reopenIssuable', { notesData: { reopenIssuePath: '' } })
           .then(() => {
@@ -203,7 +203,7 @@ describe('Actions Notes Store', () => {
 
   describe('emitStateChangedEvent', () => {
     it('emits an event on the document', () => {
-      document.addEventListener('issuable_vue_app:change', event => {
+      document.addEventListener('issuable_vue_app:change', (event) => {
         expect(event.detail.data).toEqual({ id: '1', state: 'closed' });
         expect(event.detail.isClosed).toEqual(false);
       });
@@ -213,7 +213,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('toggleStateButtonLoading', () => {
-    it('should set loading as true', done => {
+    it('should set loading as true', (done) => {
       testAction(
         actions.toggleStateButtonLoading,
         true,
@@ -224,7 +224,7 @@ describe('Actions Notes Store', () => {
       );
     });
 
-    it('should set loading as false', done => {
+    it('should set loading as false', (done) => {
       testAction(
         actions.toggleStateButtonLoading,
         false,
@@ -237,11 +237,11 @@ describe('Actions Notes Store', () => {
   });
 
   describe('toggleIssueLocalState', () => {
-    it('sets issue state as closed', done => {
+    it('sets issue state as closed', (done) => {
       testAction(actions.toggleIssueLocalState, 'closed', {}, [{ type: 'CLOSE_ISSUE' }], [], done);
     });
 
-    it('sets issue state as reopened', done => {
+    it('sets issue state as reopened', (done) => {
       testAction(
         actions.toggleIssueLocalState,
         'reopened',
@@ -297,7 +297,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('poll', () => {
-    beforeEach(done => {
+    beforeEach((done) => {
       axiosMock
         .onGet(notesDataMock.notesPath)
         .reply(200, { notes: [], last_fetched_at: '123456' }, { 'poll-interval': '1000' });
@@ -305,13 +305,13 @@ describe('Actions Notes Store', () => {
       store.dispatch('setNotesData', notesDataMock).then(done).catch(done.fail);
     });
 
-    it('calls service with last fetched state', done => {
+    it('calls service with last fetched state', (done) => {
       store
         .dispatch('poll')
         .then(() => {
           jest.advanceTimersByTime(2);
         })
-        .then(() => new Promise(resolve => requestAnimationFrame(resolve)))
+        .then(() => new Promise((resolve) => requestAnimationFrame(resolve)))
         .then(() => {
           expect(store.state.lastFetchedAt).toBe('123456');
 
@@ -319,7 +319,7 @@ describe('Actions Notes Store', () => {
         })
         .then(
           () =>
-            new Promise(resolve => {
+            new Promise((resolve) => {
               requestAnimationFrame(resolve);
             }),
         )
@@ -337,7 +337,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setNotesFetchedState', () => {
-    it('should set notes fetched state', done => {
+    it('should set notes fetched state', (done) => {
       testAction(
         actions.setNotesFetchedState,
         true,
@@ -364,7 +364,7 @@ describe('Actions Notes Store', () => {
       document.body.setAttribute('data-page', '');
     });
 
-    it('commits DELETE_NOTE and dispatches updateMergeRequestWidget', done => {
+    it('commits DELETE_NOTE and dispatches updateMergeRequestWidget', (done) => {
       const note = { path: endpoint, id: 1 };
 
       testAction(
@@ -389,7 +389,7 @@ describe('Actions Notes Store', () => {
       );
     });
 
-    it('dispatches removeDiscussionsFromDiff on merge request page', done => {
+    it('dispatches removeDiscussionsFromDiff on merge request page', (done) => {
       const note = { path: endpoint, id: 1 };
 
       document.body.setAttribute('data-page', 'projects:merge_requests:show');
@@ -435,7 +435,7 @@ describe('Actions Notes Store', () => {
       document.body.setAttribute('data-page', '');
     });
 
-    it('dispatches removeNote', done => {
+    it('dispatches removeNote', (done) => {
       const note = { path: endpoint, id: 1 };
 
       testAction(
@@ -468,7 +468,7 @@ describe('Actions Notes Store', () => {
         axiosMock.onAny().reply(200, res);
       });
 
-      it('commits ADD_NEW_NOTE and dispatches updateMergeRequestWidget', done => {
+      it('commits ADD_NEW_NOTE and dispatches updateMergeRequestWidget', (done) => {
         testAction(
           actions.createNewNote,
           { endpoint: `${TEST_HOST}`, data: {} },
@@ -504,7 +504,7 @@ describe('Actions Notes Store', () => {
         axiosMock.onAny().replyOnce(200, res);
       });
 
-      it('does not commit ADD_NEW_NOTE or dispatch updateMergeRequestWidget', done => {
+      it('does not commit ADD_NEW_NOTE or dispatch updateMergeRequestWidget', (done) => {
         testAction(
           actions.createNewNote,
           { endpoint: `${TEST_HOST}`, data: {} },
@@ -527,7 +527,7 @@ describe('Actions Notes Store', () => {
     });
 
     describe('as note', () => {
-      it('commits UPDATE_NOTE and dispatches updateMergeRequestWidget', done => {
+      it('commits UPDATE_NOTE and dispatches updateMergeRequestWidget', (done) => {
         testAction(
           actions.toggleResolveNote,
           { endpoint: `${TEST_HOST}`, isResolved: true, discussion: false },
@@ -552,7 +552,7 @@ describe('Actions Notes Store', () => {
     });
 
     describe('as discussion', () => {
-      it('commits UPDATE_DISCUSSION and dispatches updateMergeRequestWidget', done => {
+      it('commits UPDATE_DISCUSSION and dispatches updateMergeRequestWidget', (done) => {
         testAction(
           actions.toggleResolveNote,
           { endpoint: `${TEST_HOST}`, isResolved: true, discussion: true },
@@ -588,7 +588,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setCommentsDisabled', () => {
-    it('should set comments disabled state', done => {
+    it('should set comments disabled state', (done) => {
       testAction(
         actions.setCommentsDisabled,
         true,
@@ -601,7 +601,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('updateResolvableDiscussionsCounts', () => {
-    it('commits UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS', done => {
+    it('commits UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS', (done) => {
       testAction(
         actions.updateResolvableDiscussionsCounts,
         null,
@@ -614,7 +614,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('convertToDiscussion', () => {
-    it('commits CONVERT_TO_DISCUSSION with noteId', done => {
+    it('commits CONVERT_TO_DISCUSSION with noteId', (done) => {
       const noteId = 'dummy-note-id';
       testAction(
         actions.convertToDiscussion,
@@ -718,7 +718,7 @@ describe('Actions Notes Store', () => {
   describe('replyToDiscussion', () => {
     const payload = { endpoint: TEST_HOST, data: {} };
 
-    it('updates discussion if response contains disussion', done => {
+    it('updates discussion if response contains disussion', (done) => {
       const discussion = { notes: [] };
       axiosMock.onAny().reply(200, { discussion });
 
@@ -738,7 +738,7 @@ describe('Actions Notes Store', () => {
       );
     });
 
-    it('adds a reply to a discussion', done => {
+    it('adds a reply to a discussion', (done) => {
       const res = {};
       axiosMock.onAny().reply(200, res);
 
@@ -756,7 +756,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('removeConvertedDiscussion', () => {
-    it('commits CONVERT_TO_DISCUSSION with noteId', done => {
+    it('commits CONVERT_TO_DISCUSSION with noteId', (done) => {
       const noteId = 'dummy-id';
       testAction(
         actions.removeConvertedDiscussion,
@@ -781,7 +781,7 @@ describe('Actions Notes Store', () => {
       };
     });
 
-    it('when unresolved, dispatches action', done => {
+    it('when unresolved, dispatches action', (done) => {
       testAction(
         actions.resolveDiscussion,
         { discussionId },
@@ -801,8 +801,8 @@ describe('Actions Notes Store', () => {
       );
     });
 
-    it('when resolved, does nothing', done => {
-      getters.isDiscussionResolved = id => id === discussionId;
+    it('when resolved, does nothing', (done) => {
+      getters.isDiscussionResolved = (id) => id === discussionId;
 
       testAction(
         actions.resolveDiscussion,
@@ -823,7 +823,7 @@ describe('Actions Notes Store', () => {
       const res = { errors: { something: ['went wrong'] } };
       const error = { message: 'Unprocessable entity', response: { data: res } };
 
-      it('throws an error', done => {
+      it('throws an error', (done) => {
         actions
           .saveNote(
             {
@@ -833,7 +833,7 @@ describe('Actions Notes Store', () => {
             payload,
           )
           .then(() => done.fail('Expected error to be thrown!'))
-          .catch(err => {
+          .catch((err) => {
             expect(err).toBe(error);
             expect(Flash).not.toHaveBeenCalled();
           })
@@ -846,7 +846,7 @@ describe('Actions Notes Store', () => {
       const res = { errors: { base: ['something went wrong'] } };
       const error = { message: 'Unprocessable entity', response: { data: res } };
 
-      it('sets flash alert using errors.base message', done => {
+      it('sets flash alert using errors.base message', (done) => {
         actions
           .saveNote(
             {
@@ -855,7 +855,7 @@ describe('Actions Notes Store', () => {
             },
             { ...payload, flashContainer },
           )
-          .then(resp => {
+          .then((resp) => {
             expect(resp.hasFlash).toBe(true);
             expect(Flash).toHaveBeenCalledWith(
               'Your comment could not be submitted because something went wrong',
@@ -872,7 +872,7 @@ describe('Actions Notes Store', () => {
     describe('if response contains no errors', () => {
       const res = { valid: true };
 
-      it('returns the response', done => {
+      it('returns the response', (done) => {
         actions
           .saveNote(
             {
@@ -881,7 +881,7 @@ describe('Actions Notes Store', () => {
             },
             payload,
           )
-          .then(data => {
+          .then((data) => {
             expect(data).toBe(res);
             expect(Flash).not.toHaveBeenCalled();
           })
@@ -914,7 +914,7 @@ describe('Actions Notes Store', () => {
         .catch(done.fail);
     };
 
-    it('when service success, commits and resolves discussion', done => {
+    it('when service success, commits and resolves discussion', (done) => {
       testSubmitSuggestion(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_RESOLVING_DISCUSSION, true],
@@ -931,7 +931,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when service fails, flashes error message', done => {
+    it('when service fails, flashes error message', (done) => {
       const response = { response: { data: { message: TEST_ERROR_MESSAGE } } };
 
       Api.applySuggestion.mockReturnValue(Promise.reject(response));
@@ -946,7 +946,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when service fails, and no error message available, uses default message', done => {
+    it('when service fails, and no error message available, uses default message', (done) => {
       const response = { response: 'foo' };
 
       Api.applySuggestion.mockReturnValue(Promise.reject(response));
@@ -965,7 +965,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when resolve discussion fails, fail gracefully', done => {
+    it('when resolve discussion fails, fail gracefully', (done) => {
       dispatch.mockReturnValue(Promise.reject());
 
       testSubmitSuggestion(done, () => {
@@ -996,7 +996,7 @@ describe('Actions Notes Store', () => {
         .catch(done.fail);
     };
 
-    it('when service succeeds, commits, resolves discussions, resets batch and applying batch state', done => {
+    it('when service succeeds, commits, resolves discussions, resets batch and applying batch state', (done) => {
       testSubmitSuggestionBatch(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_APPLYING_BATCH_STATE, true],
@@ -1019,7 +1019,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when service fails, flashes error message, resets applying batch state', done => {
+    it('when service fails, flashes error message, resets applying batch state', (done) => {
       const response = { response: { data: { message: TEST_ERROR_MESSAGE } } };
 
       Api.applySuggestionBatch.mockReturnValue(Promise.reject(response));
@@ -1037,7 +1037,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when service fails, and no error message available, uses default message', done => {
+    it('when service fails, and no error message available, uses default message', (done) => {
       const response = { response: 'foo' };
 
       Api.applySuggestionBatch.mockReturnValue(Promise.reject(response));
@@ -1059,7 +1059,7 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    it('when resolve discussions fails, fails gracefully, resets batch and applying batch state', done => {
+    it('when resolve discussions fails, fails gracefully, resets batch and applying batch state', (done) => {
       dispatch.mockReturnValue(Promise.reject());
 
       testSubmitSuggestionBatch(done, () => {
@@ -1081,7 +1081,7 @@ describe('Actions Notes Store', () => {
   describe('addSuggestionInfoToBatch', () => {
     const suggestionInfo = batchSuggestionsInfoMock[0];
 
-    it("adds a suggestion's info to the current batch", done => {
+    it("adds a suggestion's info to the current batch", (done) => {
       testAction(
         actions.addSuggestionInfoToBatch,
         suggestionInfo,
@@ -1096,7 +1096,7 @@ describe('Actions Notes Store', () => {
   describe('removeSuggestionInfoFromBatch', () => {
     const suggestionInfo = batchSuggestionsInfoMock[0];
 
-    it("removes a suggestion's info the current batch", done => {
+    it("removes a suggestion's info the current batch", (done) => {
       testAction(
         actions.removeSuggestionInfoFromBatch,
         suggestionInfo.suggestionId,
@@ -1136,7 +1136,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setDiscussionSortDirection', () => {
-    it('calls the correct mutation with the correct args', done => {
+    it('calls the correct mutation with the correct args', (done) => {
       testAction(
         actions.setDiscussionSortDirection,
         { direction: notesConstants.DESC, persist: false },
@@ -1154,7 +1154,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('setSelectedCommentPosition', () => {
-    it('calls the correct mutation with the correct args', done => {
+    it('calls the correct mutation with the correct args', (done) => {
       testAction(
         actions.setSelectedCommentPosition,
         {},
@@ -1175,7 +1175,7 @@ describe('Actions Notes Store', () => {
     };
 
     describe('if response contains no errors', () => {
-      it('dispatches requestDeleteDescriptionVersion', done => {
+      it('dispatches requestDeleteDescriptionVersion', (done) => {
         axiosMock.onDelete(endpoint).replyOnce(200);
         testAction(
           actions.softDeleteDescriptionVersion,
@@ -1198,7 +1198,7 @@ describe('Actions Notes Store', () => {
 
     describe('if response contains errors', () => {
       const errorMessage = 'Request failed with status code 503';
-      it('dispatches receiveDeleteDescriptionVersionError and throws an error', done => {
+      it('dispatches receiveDeleteDescriptionVersionError and throws an error', (done) => {
         axiosMock.onDelete(endpoint).replyOnce(503);
         testAction(
           actions.softDeleteDescriptionVersion,
@@ -1233,7 +1233,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('updateAssignees', () => {
-    it('update the assignees state', done => {
+    it('update the assignees state', (done) => {
       testAction(
         actions.updateAssignees,
         [userDataMock.id],
@@ -1348,7 +1348,7 @@ describe('Actions Notes Store', () => {
   });
 
   describe('updateDiscussionPosition', () => {
-    it('update the assignees state', done => {
+    it('update the assignees state', (done) => {
       const updatedPosition = { discussionId: 1, position: { test: true } };
       testAction(
         actions.updateDiscussionPosition,
diff --git a/spec/frontend/notes/stores/getters_spec.js b/spec/frontend/notes/stores/getters_spec.js
index deef3572763..fd04d08b6a5 100644
--- a/spec/frontend/notes/stores/getters_spec.js
+++ b/spec/frontend/notes/stores/getters_spec.js
@@ -72,7 +72,7 @@ describe('Getters Notes Store', () => {
       state.isTimelineEnabled = true;
 
       expect(getters.discussions(state).length).toEqual(discussionMock.notes.length);
-      getters.discussions(state).forEach(discussion => {
+      getters.discussions(state).forEach((discussion) => {
         expect(discussion.individual_note).toBe(true);
         expect(discussion.id).toBe(discussion.notes[0].id);
         expect(discussion.created_at).toBe(discussion.notes[0].created_at);
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index ec4de925721..66fc74525ad 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -357,7 +357,7 @@ describe('Notes Store mutations', () => {
 
       mutations.SET_EXPAND_DISCUSSIONS(state, { discussionIds, expanded: true });
 
-      state.discussions.forEach(discussion => {
+      state.discussions.forEach((discussion) => {
         expect(discussion.expanded).toEqual(true);
       });
     });
@@ -371,7 +371,7 @@ describe('Notes Store mutations', () => {
 
       mutations.SET_EXPAND_DISCUSSIONS(state, { discussionIds, expanded: false });
 
-      state.discussions.forEach(discussion => {
+      state.discussions.forEach((discussion) => {
         expect(discussion.expanded).toEqual(false);
       });
     });
@@ -698,7 +698,7 @@ describe('Notes Store mutations', () => {
   });
 
   describe('SET_APPLYING_BATCH_STATE', () => {
-    const buildDiscussions = suggestionsInfo => {
+    const buildDiscussions = (suggestionsInfo) => {
       const suggestions = suggestionsInfo.map(({ suggestionId }) => ({ id: suggestionId }));
 
       const notes = suggestionsInfo.map(({ noteId }, index) => ({
@@ -738,7 +738,7 @@ describe('Notes Store mutations', () => {
       const expectedSuggestions = [updatedSuggestion, suggestions[1]];
 
       const actualSuggestions = state.discussions
-        .map(discussion => discussion.notes.map(n => n.suggestions))
+        .map((discussion) => discussion.notes.map((n) => n.suggestions))
         .flat(2);
 
       expect(actualSuggestions).toEqual(expectedSuggestions);