1 files changed, 21 insertions, 35 deletions

diff --git a/spec/frontend/notes/components/discussion_filter_spec.js b/spec/frontend/notes/components/discussion_filter_spec.js
index 17998dfc9d5..27206bddbfc 100644
--- a/spec/frontend/notes/components/discussion_filter_spec.js
+++ b/spec/frontend/notes/components/discussion_filter_spec.js
@@ -1,5 +1,6 @@
 import { GlDropdown } from '@gitlab/ui';
-import { createLocalVue, mount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
+import Vue, { nextTick } from 'vue';
 import AxiosMockAdapter from 'axios-mock-adapter';
 import Vuex from 'vuex';
 import { TEST_HOST } from 'helpers/test_constants';
@@ -12,9 +13,7 @@ import notesModule from '~/notes/stores/modules';
 
 import { discussionFiltersMock, discussionMock } from '../mock_data';
 
-const localVue = createLocalVue();
-
-localVue.use(Vuex);
+Vue.use(Vuex);
 
 const DISCUSSION_PATH = `${TEST_HOST}/example`;
 
@@ -58,7 +57,6 @@ describe('DiscussionFilter component', () => {
         filters: discussionFiltersMock,
         selectedValue: DISCUSSION_FILTERS_DEFAULT_VALUE,
       },
-      localVue,
     });
   };
 
@@ -153,13 +151,11 @@ describe('DiscussionFilter component', () => {
       window.mrTabs = undefined;
     });
 
-    it('only renders when discussion tab is active', (done) => {
+    it('only renders when discussion tab is active', async () => {
       eventHub.$emit('MergeRequestTabChange', 'commit');
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.html()).toBe('');
-        done();
-      });
+      await nextTick();
+      expect(wrapper.html()).toBe('');
     });
   });
 
@@ -168,58 +164,48 @@ describe('DiscussionFilter component', () => {
       window.location.hash = '';
     });
 
-    it('updates the filter when the URL links to a note', (done) => {
+    it('updates the filter when the URL links to a note', async () => {
       window.location.hash = `note_${discussionMock.notes[0].id}`;
       wrapper.vm.currentValue = discussionFiltersMock[2].value;
       wrapper.vm.handleLocationHash();
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
-        done();
-      });
+      await nextTick();
+      expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
     });
 
-    it('does not update the filter when the current filter is "Show all activity"', (done) => {
+    it('does not update the filter when the current filter is "Show all activity"', async () => {
       window.location.hash = `note_${discussionMock.notes[0].id}`;
       wrapper.vm.handleLocationHash();
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
-        done();
-      });
+      await nextTick();
+      expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
     });
 
-    it('only updates filter when the URL links to a note', (done) => {
+    it('only updates filter when the URL links to a note', async () => {
       window.location.hash = `testing123`;
       wrapper.vm.handleLocationHash();
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
-        done();
-      });
+      await nextTick();
+      expect(wrapper.vm.currentValue).toBe(DISCUSSION_FILTERS_DEFAULT_VALUE);
     });
 
-    it('fetches discussions when there is a hash', (done) => {
+    it('fetches discussions when there is a hash', async () => {
       window.location.hash = `note_${discussionMock.notes[0].id}`;
       wrapper.vm.currentValue = discussionFiltersMock[2].value;
       jest.spyOn(wrapper.vm, 'selectFilter').mockImplementation(() => {});
       wrapper.vm.handleLocationHash();
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.selectFilter).toHaveBeenCalled();
-        done();
-      });
+      await nextTick();
+      expect(wrapper.vm.selectFilter).toHaveBeenCalled();
     });
 
-    it('does not fetch discussions when there is no hash', (done) => {
+    it('does not fetch discussions when there is no hash', async () => {
       window.location.hash = '';
       jest.spyOn(wrapper.vm, 'selectFilter').mockImplementation(() => {});
       wrapper.vm.handleLocationHash();
 
-      wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.selectFilter).not.toHaveBeenCalled();
-        done();
-      });
+      await nextTick();
+      expect(wrapper.vm.selectFilter).not.toHaveBeenCalled();
     });
   });
 });