Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 28 deletions

diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js
index 177b026491c..f3aae21163b 100644
--- a/spec/frontend/pipelines/graph/action_component_spec.js
+++ b/spec/frontend/pipelines/graph/action_component_spec.js
@@ -1,6 +1,7 @@
 import { GlButton } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
+import { nextTick } from 'vue';
 import waitForPromises from 'helpers/wait_for_promises';
 import axios from '~/lib/utils/axios_utils';
 import ActionComponent from '~/pipelines/components/jobs_shared/action_component.vue';
@@ -33,16 +34,11 @@ describe('pipeline graph action component', () => {
     expect(wrapper.attributes('title')).toBe('bar');
   });
 
-  it('should update bootstrap tooltip when title changes', (done) => {
+  it('should update bootstrap tooltip when title changes', async () => {
     wrapper.setProps({ tooltipText: 'changed' });
 
-    wrapper.vm
-      .$nextTick()
-      .then(() => {
-        expect(wrapper.attributes('title')).toBe('changed');
-      })
-      .then(done)
-      .catch(done.fail);
+    await nextTick();
+    expect(wrapper.attributes('title')).toBe('changed');
   });
 
   it('should render an svg', () => {
@@ -64,13 +60,11 @@ describe('pipeline graph action component', () => {
         .catch(done.fail);
     });
 
-    it('renders a loading icon while waiting for request', (done) => {
+    it('renders a loading icon while waiting for request', async () => {
       findButton().trigger('click');
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.find('.js-action-icon-loading').exists()).toBe(true);
-        done();
-      });
+      await nextTick();
+      expect(wrapper.find('.js-action-icon-loading').exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js
index 06f1fa4c827..a6b3a96144a 100644
--- a/spec/frontend/pipelines/graph/job_item_spec.js
+++ b/spec/frontend/pipelines/graph/job_item_spec.js
@@ -1,4 +1,5 @@
 import { mount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import JobItem from '~/pipelines/components/graph/job_item.vue';
 
 describe('pipeline graph job item', () => {
@@ -74,22 +75,19 @@ describe('pipeline graph job item', () => {
   });
 
   describe('name with link', () => {
-    it('should render the job name and status with a link', (done) => {
+    it('should render the job name and status with a link', async () => {
       createWrapper({ job: mockJob });
 
-      wrapper.vm.$nextTick(() => {
-        const link = wrapper.find('a');
+      await nextTick();
+      const link = wrapper.find('a');
 
-        expect(link.attributes('href')).toBe(mockJob.status.detailsPath);
+      expect(link.attributes('href')).toBe(mockJob.status.detailsPath);
 
-        expect(link.attributes('title')).toBe(`${mockJob.name} - ${mockJob.status.label}`);
+      expect(link.attributes('title')).toBe(`${mockJob.name} - ${mockJob.status.label}`);
 
-        expect(wrapper.find('.ci-status-icon-success').exists()).toBe(true);
-
-        expect(wrapper.text()).toBe(mockJob.name);
+      expect(wrapper.find('.ci-status-icon-success').exists()).toBe(true);
 
-        done();
-      });
+      expect(wrapper.text()).toBe(mockJob.name);
     });
   });
 
diff --git a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
index 5897da4b8c2..ca283f3b4ce 100644
--- a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
+++ b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
@@ -1,4 +1,5 @@
-import { mount, shallowMount, createLocalVue } from '@vue/test-utils';
+import { mount, shallowMount } from '@vue/test-utils';
+import Vue, { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -41,13 +42,11 @@ describe('Linked Pipelines Column', () => {
   const findPipelineGraph = () => wrapper.find(PipelineGraph);
   const findExpandButton = () => wrapper.find('[data-testid="expand-pipeline-button"]');
 
-  const localVue = createLocalVue();
-  localVue.use(VueApollo);
+  Vue.use(VueApollo);
 
   const createComponent = ({ apolloProvider, mountFn = shallowMount, props = {} } = {}) => {
     wrapper = mountFn(LinkedPipelinesColumn, {
       apolloProvider,
-      localVue,
       propsData: {
         ...defaultProps,
         ...props,
@@ -108,7 +107,7 @@ describe('Linked Pipelines Column', () => {
         expect(layersFn).not.toHaveBeenCalled();
         await clickExpandButtonAndAwaitTimers();
         await wrapper.setProps({ viewType: LAYER_VIEW });
-        await wrapper.vm.$nextTick();
+        await nextTick();
         expect(layersFn).toHaveBeenCalledTimes(1);
         await wrapper.setProps({ viewType: STAGE_VIEW });
         await wrapper.setProps({ viewType: LAYER_VIEW });