Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 42 deletions

diff --git a/spec/frontend/ide/components/commit_sidebar/list_spec.js b/spec/frontend/ide/components/commit_sidebar/list_spec.js
index eb12fc994a5..1d42512c9ee 100644
--- a/spec/frontend/ide/components/commit_sidebar/list_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/list_spec.js
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import Vue, { nextTick } from 'vue';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import commitSidebarList from '~/ide/components/commit_sidebar/list.vue';
 import { createStore } from '~/ide/stores';
@@ -31,12 +31,11 @@ describe('Multi-file editor commit sidebar list', () => {
   });
 
   describe('with a list of files', () => {
-    beforeEach((done) => {
+    beforeEach(async () => {
       const f = file('file name');
       f.changed = true;
       vm.fileList.push(f);
-
-      Vue.nextTick(done);
+      await nextTick();
     });
 
     it('renders list', () => {
diff --git a/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js b/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js
index a6f3253321b..d899bc4f7d8 100644
--- a/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import Vue, { nextTick } from 'vue';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import radioGroup from '~/ide/components/commit_sidebar/radio_group.vue';
 import { createStore } from '~/ide/stores';
@@ -7,7 +7,7 @@ describe('IDE commit sidebar radio group', () => {
   let vm;
   let store;
 
-  beforeEach((done) => {
+  beforeEach(async () => {
     store = createStore();
 
     const Component = Vue.extend(radioGroup);
@@ -22,7 +22,7 @@ describe('IDE commit sidebar radio group', () => {
 
     vm.$mount();
 
-    Vue.nextTick(done);
+    await nextTick();
   });
 
   afterEach(() => {
@@ -33,7 +33,7 @@ describe('IDE commit sidebar radio group', () => {
     expect(vm.$el.textContent).toContain('test');
   });
 
-  it('uses slot if label is not present', (done) => {
+  it('uses slot if label is not present', async () => {
     vm.$destroy();
 
     vm = new Vue({
@@ -47,25 +47,19 @@ describe('IDE commit sidebar radio group', () => {
 
     vm.$mount();
 
-    Vue.nextTick(() => {
-      expect(vm.$el.textContent).toContain('Testing slot');
-
-      done();
-    });
+    await nextTick();
+    expect(vm.$el.textContent).toContain('Testing slot');
   });
 
-  it('updates store when changing radio button', (done) => {
+  it('updates store when changing radio button', async () => {
     vm.$el.querySelector('input').dispatchEvent(new Event('change'));
 
-    Vue.nextTick(() => {
-      expect(store.state.commit.commitAction).toBe('1');
-
-      done();
-    });
+    await nextTick();
+    expect(store.state.commit.commitAction).toBe('1');
   });
 
   describe('with input', () => {
-    beforeEach((done) => {
+    beforeEach(async () => {
       vm.$destroy();
 
       const Component = Vue.extend(radioGroup);
@@ -82,32 +76,27 @@ describe('IDE commit sidebar radio group', () => {
 
       vm.$mount();
 
-      Vue.nextTick(done);
+      await nextTick();
     });
 
     it('renders input box when commitAction matches value', () => {
       expect(vm.$el.querySelector('.form-control')).not.toBeNull();
     });
 
-    it('hides input when commitAction doesnt match value', (done) => {
+    it('hides input when commitAction doesnt match value', async () => {
       store.state.commit.commitAction = '2';
 
-      Vue.nextTick(() => {
-        expect(vm.$el.querySelector('.form-control')).toBeNull();
-        done();
-      });
+      await nextTick();
+      expect(vm.$el.querySelector('.form-control')).toBeNull();
     });
 
-    it('updates branch name in store on input', (done) => {
+    it('updates branch name in store on input', async () => {
       const input = vm.$el.querySelector('.form-control');
       input.value = 'testing-123';
       input.dispatchEvent(new Event('input'));
 
-      Vue.nextTick(() => {
-        expect(store.state.commit.newBranchName).toBe('testing-123');
-
-        done();
-      });
+      await nextTick();
+      expect(store.state.commit.newBranchName).toBe('testing-123');
     });
 
     it('renders newBranchName if present', () => {
diff --git a/spec/frontend/ide/components/commit_sidebar/success_message_spec.js b/spec/frontend/ide/components/commit_sidebar/success_message_spec.js
index 7bbe47d37af..52e35bdbb73 100644
--- a/spec/frontend/ide/components/commit_sidebar/success_message_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/success_message_spec.js
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import Vue, { nextTick } from 'vue';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import successMessage from '~/ide/components/commit_sidebar/success_message.vue';
 import { createStore } from '~/ide/stores';
@@ -23,13 +23,10 @@ describe('IDE commit panel successful commit state', () => {
     vm.$destroy();
   });
 
-  it('renders last commit message when it exists', (done) => {
+  it('renders last commit message when it exists', async () => {
     vm.$store.state.lastCommitMsg = 'testing commit message';
 
-    Vue.nextTick(() => {
-      expect(vm.$el.textContent).toContain('testing commit message');
-
-      done();
-    });
+    await nextTick();
+    expect(vm.$el.textContent).toContain('testing commit message');
   });
 });
diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js
index 6b94d7cf6f1..45d1beea3f8 100644
--- a/spec/frontend/ide/stores/actions/file_spec.js
+++ b/spec/frontend/ide/stores/actions/file_spec.js
@@ -1,5 +1,5 @@
 import MockAdapter from 'axios-mock-adapter';
-import Vue from 'vue';
+import { nextTick } from 'vue';
 import eventHub from '~/ide/eventhub';
 import { createRouter } from '~/ide/ide_router';
 import service from '~/ide/services';
@@ -68,7 +68,7 @@ describe('IDE store file actions', () => {
 
       return store
         .dispatch('closeFile', localFile)
-        .then(Vue.nextTick)
+        .then(nextTick)
         .then(() => {
           expect(store.state.openFiles.length).toBe(0);
           expect(store.state.changedFiles.length).toBe(1);
@@ -83,7 +83,7 @@ describe('IDE store file actions', () => {
 
       return store
         .dispatch('closeFile', localFile)
-        .then(Vue.nextTick)
+        .then(nextTick)
         .then(() => {
           expect(router.push).toHaveBeenCalledWith('/project/test/test/tree/main/-/newOpenFile/');
         });