Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

4 files changed, 12 insertions, 8 deletions

diff --git a/spec/frontend/projects/compare/components/app_spec.js b/spec/frontend/projects/compare/components/app_spec.js
index 7989a6f3d74..18e7f2e0f6e 100644
--- a/spec/frontend/projects/compare/components/app_spec.js
+++ b/spec/frontend/projects/compare/components/app_spec.js
@@ -1,5 +1,6 @@
 import { GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import CompareApp from '~/projects/compare/components/app.vue';
 import RevisionCard from '~/projects/compare/components/revision_card.vue';
 import { appDefaultProps as defaultProps } from './mock_data';
@@ -91,7 +92,7 @@ describe('CompareApp component', () => {
       project,
     });
 
-    await wrapper.vm.$nextTick();
+    await nextTick();
 
     expect(findTargetRevisionCard().props('selectedProject')).toEqual(
       expect.objectContaining(project),
@@ -106,7 +107,7 @@ describe('CompareApp component', () => {
       revision,
     });
 
-    await wrapper.vm.$nextTick();
+    await nextTick();
 
     expect(findSourceRevisionCard().props('paramsBranch')).toBe(revision);
   });
@@ -125,7 +126,7 @@ describe('CompareApp component', () => {
     it('swaps revisions when clicked', async () => {
       findSwapRevisionsButton().vm.$emit('click');
 
-      await wrapper.vm.$nextTick();
+      await nextTick();
 
       expect(findTargetRevisionCard().props('paramsBranch')).toBe(defaultProps.paramsTo);
       expect(findSourceRevisionCard().props('paramsBranch')).toBe(defaultProps.paramsFrom);
diff --git a/spec/frontend/projects/compare/components/repo_dropdown_spec.js b/spec/frontend/projects/compare/components/repo_dropdown_spec.js
index 27a7a32ebca..98aec347e4b 100644
--- a/spec/frontend/projects/compare/components/repo_dropdown_spec.js
+++ b/spec/frontend/projects/compare/components/repo_dropdown_spec.js
@@ -1,5 +1,6 @@
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import RepoDropdown from '~/projects/compare/components/repo_dropdown.vue';
 import { revisionCardDefaultProps as defaultProps } from './mock_data';
 
@@ -39,7 +40,7 @@ describe('RepoDropdown component', () => {
 
     it('does not emit `changeTargetProject` event', async () => {
       wrapper.vm.emitTargetProject('foo');
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(wrapper.emitted('changeTargetProject')).toBeUndefined();
     });
   });
@@ -67,13 +68,13 @@ describe('RepoDropdown component', () => {
     it('updates the hidden input value when onClick method is triggered', async () => {
       const repoId = '1';
       wrapper.vm.onClick({ id: repoId });
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(findHiddenInput().attributes('value')).toBe(repoId);
     });
 
     it('emits `selectProject` event when another target project is selected', async () => {
       findGlDropdown().findAll(GlDropdownItem).at(0).vm.$emit('click');
-      await wrapper.vm.$nextTick();
+      await nextTick();
 
       expect(wrapper.emitted('selectProject')[0][0]).toEqual({
         direction: 'from',
diff --git a/spec/frontend/projects/compare/components/revision_dropdown_legacy_spec.js b/spec/frontend/projects/compare/components/revision_dropdown_legacy_spec.js
index eb80d57fb3c..102f95f65da 100644
--- a/spec/frontend/projects/compare/components/revision_dropdown_legacy_spec.js
+++ b/spec/frontend/projects/compare/components/revision_dropdown_legacy_spec.js
@@ -1,6 +1,7 @@
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
+import { nextTick } from 'vue';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import RevisionDropdown from '~/projects/compare/components/revision_dropdown_legacy.vue';
@@ -105,7 +106,7 @@ describe('RevisionDropdown component', () => {
       // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({ branches: ['some-branch'] });
 
-      await wrapper.vm.$nextTick();
+      await nextTick();
 
       findFirstGlDropdownItem().vm.$emit('click');
 
diff --git a/spec/frontend/projects/compare/components/revision_dropdown_spec.js b/spec/frontend/projects/compare/components/revision_dropdown_spec.js
index 118bb68585e..c8a90848492 100644
--- a/spec/frontend/projects/compare/components/revision_dropdown_spec.js
+++ b/spec/frontend/projects/compare/components/revision_dropdown_spec.js
@@ -1,6 +1,7 @@
 import { GlDropdown, GlDropdownItem, GlSearchBoxByType } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
+import { nextTick } from 'vue';
 import createFlash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import RevisionDropdown from '~/projects/compare/components/revision_dropdown.vue';
@@ -141,7 +142,7 @@ describe('RevisionDropdown component', () => {
   it('emits `selectRevision` event when another revision is selected', async () => {
     createComponent();
     wrapper.vm.branches = ['some-branch'];
-    await wrapper.vm.$nextTick();
+    await nextTick();
 
     findGlDropdown().findAll(GlDropdownItem).at(0).vm.$emit('click');