Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 14 insertions, 13 deletions

diff --git a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
index 8948a9926bb..1eb9ccc9c6c 100644
--- a/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
+++ b/spec/frontend/add_context_commits_modal/components/__snapshots__/add_context_commits_modal_spec.js.snap
@@ -4,6 +4,7 @@ exports[`AddContextCommitsModal renders modal with 2 tabs 1`] = `
 <gl-modal-stub
   body-class="add-review-item pt-0"
   cancel-variant="light"
+  dismisslabel="Close"
   modalclass=""
   modalid="add-review-item"
   ok-disabled="true"
diff --git a/spec/frontend/add_context_commits_modal/store/actions_spec.js b/spec/frontend/add_context_commits_modal/store/actions_spec.js
index 24948dd6073..3bb3cb68f56 100644
--- a/spec/frontend/add_context_commits_modal/store/actions_spec.js
+++ b/spec/frontend/add_context_commits_modal/store/actions_spec.js
@@ -1,5 +1,6 @@
 import MockAdapter from 'axios-mock-adapter';
 import { TEST_HOST } from 'helpers/test_constants';
+import testAction from 'helpers/vuex_action_helper';
 import axios from '~/lib/utils/axios_utils';
 import {
   setBaseConfig,
@@ -15,7 +16,6 @@ import {
   resetModalState,
 } from '~/add_context_commits_modal/store/actions';
 import * as types from '~/add_context_commits_modal/store/mutation_types';
-import testAction from '../../helpers/vuex_action_helper';
 
 describe('AddContextCommitsModalStoreActions', () => {
   const contextCommitEndpoint =
@@ -42,7 +42,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setBaseConfig', () => {
-    it('commits SET_BASE_CONFIG', done => {
+    it('commits SET_BASE_CONFIG', (done) => {
       const options = { contextCommitsPath, mergeRequestIid, projectId };
       testAction(
         setBaseConfig,
@@ -65,7 +65,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setTabIndex', () => {
-    it('commits SET_TABINDEX', done => {
+    it('commits SET_TABINDEX', (done) => {
       testAction(
         setTabIndex,
         { tabIndex: 1 },
@@ -78,7 +78,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setCommits', () => {
-    it('commits SET_COMMITS', done => {
+    it('commits SET_COMMITS', (done) => {
       testAction(
         setCommits,
         { commits: [], silentAddition: false },
@@ -89,7 +89,7 @@ describe('AddContextCommitsModalStoreActions', () => {
       );
     });
 
-    it('commits SET_COMMITS_SILENT', done => {
+    it('commits SET_COMMITS_SILENT', (done) => {
       testAction(
         setCommits,
         { commits: [], silentAddition: true },
@@ -102,7 +102,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('createContextCommits', () => {
-    it('calls API to create context commits', done => {
+    it('calls API to create context commits', (done) => {
       mock.onPost(contextCommitEndpoint).reply(200, {});
 
       testAction(createContextCommits, { commits: [] }, {}, [], [], done);
@@ -126,7 +126,7 @@ describe('AddContextCommitsModalStoreActions', () => {
         )
         .reply(200, [dummyCommit]);
     });
-    it('commits FETCH_CONTEXT_COMMITS', done => {
+    it('commits FETCH_CONTEXT_COMMITS', (done) => {
       const contextCommit = { ...dummyCommit, isSelected: true };
       testAction(
         fetchContextCommits,
@@ -150,7 +150,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setContextCommits', () => {
-    it('commits SET_CONTEXT_COMMITS', done => {
+    it('commits SET_CONTEXT_COMMITS', (done) => {
       testAction(
         setContextCommits,
         { data: [] },
@@ -168,7 +168,7 @@ describe('AddContextCommitsModalStoreActions', () => {
         .onDelete('/api/v4/projects/gitlab-org%2Fgitlab/merge_requests/1/context_commits')
         .reply(204);
     });
-    it('calls API to remove context commits', done => {
+    it('calls API to remove context commits', (done) => {
       testAction(
         removeContextCommits,
         { forceReload: false },
@@ -181,7 +181,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setSelectedCommits', () => {
-    it('commits SET_SELECTED_COMMITS', done => {
+    it('commits SET_SELECTED_COMMITS', (done) => {
       testAction(
         setSelectedCommits,
         [dummyCommit],
@@ -194,7 +194,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setSearchText', () => {
-    it('commits SET_SEARCH_TEXT', done => {
+    it('commits SET_SEARCH_TEXT', (done) => {
       const searchText = 'Dummy Text';
       testAction(
         setSearchText,
@@ -208,7 +208,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('setToRemoveCommits', () => {
-    it('commits SET_TO_REMOVE_COMMITS', done => {
+    it('commits SET_TO_REMOVE_COMMITS', (done) => {
       const commitId = 'abcde';
 
       testAction(
@@ -223,7 +223,7 @@ describe('AddContextCommitsModalStoreActions', () => {
   });
 
   describe('resetModalState', () => {
-    it('commits RESET_MODAL_STATE', done => {
+    it('commits RESET_MODAL_STATE', (done) => {
       const commitId = 'abcde';
 
       testAction(