Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 8 deletions

diff --git a/spec/frontend/vue_shared/components/notes/system_note_spec.js b/spec/frontend/vue_shared/components/notes/system_note_spec.js
index 603c37c6c49..080dd778e29 100644
--- a/spec/frontend/vue_shared/components/notes/system_note_spec.js
+++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js
@@ -1,12 +1,10 @@
-import { createLocalVue, mount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 import IssueSystemNote from '~/vue_shared/components/notes/system_note.vue';
 import createStore from '~/notes/stores';
 import initMRPopovers from '~/mr_popover/index';
 
 jest.mock('~/mr_popover/index', () => jest.fn());
 
-const localVue = createLocalVue();
-
 describe('system note component', () => {
   let vm;
   let props;
@@ -34,7 +32,6 @@ describe('system note component', () => {
 
     vm = mount(IssueSystemNote, {
       store,
-      localVue,
       propsData: props,
       attachToDocument: true,
       sync: false,
diff --git a/spec/frontend/vue_shared/components/notes/timeline_entry_item_spec.js b/spec/frontend/vue_shared/components/notes/timeline_entry_item_spec.js
index be6c58f0683..f73d3edec5d 100644
--- a/spec/frontend/vue_shared/components/notes/timeline_entry_item_spec.js
+++ b/spec/frontend/vue_shared/components/notes/timeline_entry_item_spec.js
@@ -1,14 +1,11 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { shallowMount } from '@vue/test-utils';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
 
 describe(`TimelineEntryItem`, () => {
   let wrapper;
 
   const factory = (options = {}) => {
-    const localVue = createLocalVue();
-
     wrapper = shallowMount(TimelineEntryItem, {
-      localVue,
       ...options,
     });
   };