1 files changed, 23 insertions, 33 deletions

diff --git a/spec/frontend/notebook/cells/output/index_spec.js b/spec/frontend/notebook/cells/output/index_spec.js
index 8e04e4c146c..4d1d03e5e34 100644
--- a/spec/frontend/notebook/cells/output/index_spec.js
+++ b/spec/frontend/notebook/cells/output/index_spec.js
@@ -1,36 +1,35 @@
-import Vue, { nextTick } from 'vue';
+import { mount } from '@vue/test-utils';
 import json from 'test_fixtures/blob/notebook/basic.json';
-import CodeComponent from '~/notebook/cells/output/index.vue';
-
-const Component = Vue.extend(CodeComponent);
+import Output from '~/notebook/cells/output/index.vue';
 
 describe('Output component', () => {
-  let vm;
+  let wrapper;
 
   const createComponent = (output) => {
-    vm = new Component({
+    wrapper = mount(Output, {
       propsData: {
         outputs: [].concat(output),
         count: 1,
       },
     });
-    vm.$mount();
   };
 
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
   describe('text output', () => {
     beforeEach(() => {
       const textType = json.cells[2];
       createComponent(textType.outputs[0]);
-
-      return nextTick();
     });
 
     it('renders as plain text', () => {
-      expect(vm.$el.querySelector('pre')).not.toBeNull();
+      expect(wrapper.find('pre').exists()).toBe(true);
     });
 
     it('renders prompt', () => {
-      expect(vm.$el.querySelector('.prompt span')).not.toBeNull();
+      expect(wrapper.find('.prompt span').exists()).toBe(true);
     });
   });
 
@@ -38,12 +37,10 @@ describe('Output component', () => {
     beforeEach(() => {
       const imageType = json.cells[3];
       createComponent(imageType.outputs[0]);
-
-      return nextTick();
     });
 
     it('renders as an image', () => {
-      expect(vm.$el.querySelector('img')).not.toBeNull();
+      expect(wrapper.find('img').exists()).toBe(true);
     });
   });
 
@@ -52,16 +49,15 @@ describe('Output component', () => {
       const htmlType = json.cells[4];
       createComponent(htmlType.outputs[0]);
 
-      expect(vm.$el.querySelector('p')).not.toBeNull();
-      expect(vm.$el.querySelectorAll('p')).toHaveLength(1);
-      expect(vm.$el.textContent.trim()).toContain('test');
+      expect(wrapper.findAll('p')).toHaveLength(1);
+      expect(wrapper.text()).toContain('test');
     });
 
     it('renders multiple raw HTML outputs', () => {
       const htmlType = json.cells[4];
       createComponent([htmlType.outputs[0], htmlType.outputs[0]]);
 
-      expect(vm.$el.querySelectorAll('p')).toHaveLength(2);
+      expect(wrapper.findAll('p')).toHaveLength(2);
     });
   });
 
@@ -77,7 +73,7 @@ describe('Output component', () => {
       };
       createComponent(output);
 
-      expect(vm.$el.querySelector('.MathJax')).not.toBeNull();
+      expect(wrapper.find('.MathJax').exists()).toBe(true);
     });
   });
 
@@ -85,12 +81,10 @@ describe('Output component', () => {
     beforeEach(() => {
       const svgType = json.cells[5];
       createComponent(svgType.outputs[0]);
-
-      return nextTick();
     });
 
     it('renders as an svg', () => {
-      expect(vm.$el.querySelector('svg')).not.toBeNull();
+      expect(wrapper.find('svg').exists()).toBe(true);
     });
   });
 
@@ -98,27 +92,23 @@ describe('Output component', () => {
     beforeEach(() => {
       const unknownType = json.cells[6];
       createComponent(unknownType.outputs[0]);
-
-      return nextTick();
     });
 
     it('renders as plain text', () => {
-      expect(vm.$el.querySelector('pre')).not.toBeNull();
-      expect(vm.$el.textContent.trim()).toContain('testing');
+      expect(wrapper.find('pre').exists()).toBe(true);
+      expect(wrapper.text()).toContain('testing');
     });
 
-    it('renders promot', () => {
-      expect(vm.$el.querySelector('.prompt span')).not.toBeNull();
+    it('renders prompt', () => {
+      expect(wrapper.find('.prompt span').exists()).toBe(true);
     });
 
-    it("renders as plain text when doesn't recognise other types", async () => {
+    it("renders as plain text when doesn't recognise other types", () => {
       const unknownType = json.cells[7];
       createComponent(unknownType.outputs[0]);
 
-      await nextTick();
-
-      expect(vm.$el.querySelector('pre')).not.toBeNull();
-      expect(vm.$el.textContent.trim()).toContain('testing');
+      expect(wrapper.find('pre').exists()).toBe(true);
+      expect(wrapper.text()).toContain('testing');
     });
   });
 });