Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 23 deletions

diff --git a/spec/frontend/vue_shared/components/code_block_spec.js b/spec/frontend/vue_shared/components/code_block_spec.js
index 6b91a20ff76..0d21dd94f7c 100644
--- a/spec/frontend/vue_shared/components/code_block_spec.js
+++ b/spec/frontend/vue_shared/components/code_block_spec.js
@@ -1,33 +1,25 @@
-import Vue from 'vue';
-import component from '~/vue_shared/components/code_block.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
+import { shallowMount } from '@vue/test-utils';
+import CodeBlock from '~/vue_shared/components/code_block.vue';
 
 describe('Code Block', () => {
-  const Component = Vue.extend(component);
-  let vm;
+  let wrapper;
 
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('renders a code block with the provided code', () => {
-    const code =
-      "Failure/Error: is_expected.to eq(3)\n\n  expected: 3\n       got: -1\n\n  (compared using ==)\n./spec/test_spec.rb:12:in `block (4 levels) in \u003ctop (required)\u003e'";
-
-    vm = mountComponent(Component, {
-      code,
+  const createComponent = () => {
+    wrapper = shallowMount(CodeBlock, {
+      propsData: {
+        code: 'test-code',
+      },
     });
+  };
 
-    expect(vm.$el.querySelector('code').textContent).toEqual(code);
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
   });
 
-  it('escapes XSS injections', () => {
-    const code = 'CCC<img src=x onerror=alert(document.domain)>';
-
-    vm = mountComponent(Component, {
-      code,
-    });
+  it('matches snapshot', () => {
+    createComponent();
 
-    expect(vm.$el.querySelector('code').textContent).toEqual(code);
+    expect(wrapper.element).toMatchSnapshot();
   });
 });