Add latest changes from gitlab-org/gitlab@master

4 files changed, 34 insertions, 38 deletions

diff --git a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js
index 1941a7f2777..212f8e19a6d 100644
--- a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js
+++ b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js
@@ -1,5 +1,6 @@
 import { GlButton } from '@gitlab/ui';
 import { shallowMount, mount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue';
 import { singleNote, multiNote } from './mock_data';
 
@@ -82,26 +83,24 @@ describe('The DAG annotations', () => {
     });
 
     describe('clicking hide', () => {
-      it('hides listed items and changes text to show', () => {
+      it('hides listed items and changes text to show', async () => {
         expect(getAllTextBlocks().length).toBe(Object.keys(multiNote).length);
         expect(getToggleButton().text()).toBe('Hide list');
         getToggleButton().trigger('click');
-        return wrapper.vm.$nextTick().then(() => {
-          expect(getAllTextBlocks().length).toBe(0);
-          expect(getToggleButton().text()).toBe('Show list');
-        });
+        await nextTick();
+        expect(getAllTextBlocks().length).toBe(0);
+        expect(getToggleButton().text()).toBe('Show list');
       });
     });
 
     describe('clicking show', () => {
-      it('shows listed items and changes text to hide', () => {
+      it('shows listed items and changes text to hide', async () => {
         getToggleButton().trigger('click');
         getToggleButton().trigger('click');
 
-        return wrapper.vm.$nextTick().then(() => {
-          expect(getAllTextBlocks().length).toBe(Object.keys(multiNote).length);
-          expect(getToggleButton().text()).toBe('Hide list');
-        });
+        await nextTick();
+        expect(getAllTextBlocks().length).toBe(Object.keys(multiNote).length);
+        expect(getToggleButton().text()).toBe('Hide list');
       });
     });
   });
diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js
index 14030930657..d78df3eb35e 100644
--- a/spec/frontend/pipelines/components/dag/dag_spec.js
+++ b/spec/frontend/pipelines/components/dag/dag_spec.js
@@ -1,5 +1,6 @@
 import { GlAlert, GlEmptyState } from '@gitlab/ui';
 import { mount, shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
 import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '~/pipelines/components/dag/constants';
 import Dag from '~/pipelines/components/dag/dag.vue';
 import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue';
@@ -153,11 +154,11 @@ describe('Pipeline DAG graph wrapper', () => {
       expect(getNotes().exists()).toBe(false);
 
       getGraph().vm.$emit('update-annotation', { type: ADD_NOTE, data: currentNote });
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(getNotes().exists()).toBe(true);
 
       getGraph().vm.$emit('update-annotation', { type: REMOVE_NOTE, data: currentNote });
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(getNotes().exists()).toBe(false);
     });
 
@@ -165,11 +166,11 @@ describe('Pipeline DAG graph wrapper', () => {
       expect(getNotes().exists()).toBe(false);
 
       getGraph().vm.$emit('update-annotation', { type: REPLACE_NOTES, data: multiNote });
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(getNotes().exists()).toBe(true);
 
       getGraph().vm.$emit('update-annotation', { type: REPLACE_NOTES, data: {} });
-      await wrapper.vm.$nextTick();
+      await nextTick();
       expect(getNotes().exists()).toBe(false);
     });
   });
diff --git a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
index 547c0cdda5e..65814ad9a7f 100644
--- a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
+++ b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
@@ -1,5 +1,6 @@
 import { GlIntersectionObserver, GlSkeletonLoader } from '@gitlab/ui';
-import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -9,8 +10,7 @@ import JobsTable from '~/jobs/components/table/jobs_table.vue';
 import getPipelineJobsQuery from '~/pipelines/graphql/queries/get_pipeline_jobs.query.graphql';
 import { mockPipelineJobsQueryResponse } from '../../mock_data';
 
-const localVue = createLocalVue();
-localVue.use(VueApollo);
+Vue.use(VueApollo);
 
 jest.mock('~/flash');
 
@@ -36,7 +36,6 @@ describe('Jobs app', () => {
         fullPath: 'root/ci-project',
         pipelineIid: 1,
       },
-      localVue,
       apolloProvider: createMockApolloProvider(resolver),
     });
   };
diff --git a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
index 661c8d99477..97b59a09518 100644
--- a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
+++ b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
@@ -1,6 +1,7 @@
 import { GlFilteredSearch } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
+import { nextTick } from 'vue';
 import Api from '~/api';
 import axios from '~/lib/utils/axios_utils';
 import PipelinesFilteredSearch from '~/pipelines/components/pipelines_list/pipelines_filtered_search.vue';
@@ -103,46 +104,42 @@ describe('Pipelines filtered search', () => {
     expect(wrapper.emitted('filterPipelines')[0]).toEqual([mockSearch]);
   });
 
-  it('disables tag name token when branch name token is active', () => {
+  it('disables tag name token when branch name token is active', async () => {
     findFilteredSearch().vm.$emit('input', [
       { type: 'ref', value: { data: 'branch-1', operator: '=' } },
       { type: 'filtered-search-term', value: { data: '' } },
     ]);
 
-    return wrapper.vm.$nextTick().then(() => {
-      expect(findBranchToken().disabled).toBe(false);
-      expect(findTagToken().disabled).toBe(true);
-    });
+    await nextTick();
+    expect(findBranchToken().disabled).toBe(false);
+    expect(findTagToken().disabled).toBe(true);
   });
 
-  it('disables branch name token when tag name token is active', () => {
+  it('disables branch name token when tag name token is active', async () => {
     findFilteredSearch().vm.$emit('input', [
       { type: 'tag', value: { data: 'tag-1', operator: '=' } },
       { type: 'filtered-search-term', value: { data: '' } },
     ]);
 
-    return wrapper.vm.$nextTick().then(() => {
-      expect(findBranchToken().disabled).toBe(true);
-      expect(findTagToken().disabled).toBe(false);
-    });
+    await nextTick();
+    expect(findBranchToken().disabled).toBe(true);
+    expect(findTagToken().disabled).toBe(false);
   });
 
-  it('resets tokens disabled state on clear', () => {
+  it('resets tokens disabled state on clear', async () => {
     findFilteredSearch().vm.$emit('clearInput');
 
-    return wrapper.vm.$nextTick().then(() => {
-      expect(findBranchToken().disabled).toBe(false);
-      expect(findTagToken().disabled).toBe(false);
-    });
+    await nextTick();
+    expect(findBranchToken().disabled).toBe(false);
+    expect(findTagToken().disabled).toBe(false);
   });
 
-  it('resets tokens disabled state when clearing tokens by backspace', () => {
+  it('resets tokens disabled state when clearing tokens by backspace', async () => {
     findFilteredSearch().vm.$emit('input', [{ type: 'filtered-search-term', value: { data: '' } }]);
 
-    return wrapper.vm.$nextTick().then(() => {
-      expect(findBranchToken().disabled).toBe(false);
-      expect(findTagToken().disabled).toBe(false);
-    });
+    await nextTick();
+    expect(findBranchToken().disabled).toBe(false);
+    expect(findTagToken().disabled).toBe(false);
   });
 
   describe('Url query params', () => {