Add latest changes from gitlab-org/gitlab@master

2 files changed, 31 insertions, 33 deletions

diff --git a/spec/frontend/vue_mr_widget/components/review_app_link_spec.js b/spec/frontend/vue_mr_widget/components/review_app_link_spec.js
index 81a52890db7..e393b56034d 100644
--- a/spec/frontend/vue_mr_widget/components/review_app_link_spec.js
+++ b/spec/frontend/vue_mr_widget/components/review_app_link_spec.js
@@ -1,10 +1,8 @@
-import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
 import { mockTracking, triggerEvent } from 'helpers/tracking_helper';
-import mountComponent from 'helpers/vue_mount_component_helper';
-import component from '~/vue_merge_request_widget/components/review_app_link.vue';
+import ReviewAppLink from '~/vue_merge_request_widget/components/review_app_link.vue';
 
 describe('review app link', () => {
-  const Component = Vue.extend(component);
   const props = {
     link: '/review',
     cssClass: 'js-link',
@@ -13,37 +11,35 @@ describe('review app link', () => {
       tooltip: '',
     },
   };
-  let vm;
-  let el;
+  let wrapper;
 
   beforeEach(() => {
-    vm = mountComponent(Component, props);
-    el = vm.$el;
+    wrapper = shallowMount(ReviewAppLink, { propsData: props });
   });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   it('renders provided link as href attribute', () => {
-    expect(el.getAttribute('href')).toEqual(props.link);
+    expect(wrapper.attributes('href')).toBe(props.link);
   });
 
   it('renders provided cssClass as class attribute', () => {
-    expect(el.getAttribute('class')).toContain(props.cssClass);
+    expect(wrapper.classes('js-link')).toBe(true);
   });
 
   it('renders View app text', () => {
-    expect(el.textContent.trim()).toEqual('View app');
+    expect(wrapper.text().trim()).toBe('View app');
   });
 
   it('renders svg icon', () => {
-    expect(el.querySelector('svg')).not.toBeNull();
+    expect(wrapper.find('svg')).not.toBeNull();
   });
 
   it('tracks an event when clicked', () => {
-    const spy = mockTracking('_category_', el, jest.spyOn);
-    triggerEvent(el);
+    const spy = mockTracking('_category_', wrapper.element, jest.spyOn);
+    triggerEvent(wrapper.element);
 
     expect(spy).toHaveBeenCalledWith('_category_', 'open_review_app', {
       label: 'review_app',
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
index 222cb74cc66..b16fb5171e7 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
@@ -1,29 +1,30 @@
-import Vue from 'vue';
-import mountComponent from 'helpers/vue_mount_component_helper';
-import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
+import { shallowMount } from '@vue/test-utils';
+import MrWidgetMerging from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
 
 describe('MRWidgetMerging', () => {
-  let vm;
-  beforeEach(() => {
-    const Component = Vue.extend(mergingComponent);
+  let wrapper;
 
-    vm = mountComponent(Component, {
-      mr: {
-        targetBranchPath: '/branch-path',
-        targetBranch: 'branch',
+  beforeEach(() => {
+    wrapper = shallowMount(MrWidgetMerging, {
+      propsData: {
+        mr: {
+          targetBranchPath: '/branch-path',
+          targetBranch: 'branch',
+        },
       },
     });
   });
 
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
 
   it('renders information about merge request being merged', () => {
     expect(
-      vm.$el
-        .querySelector('.media-body')
-        .textContent.trim()
+      wrapper
+        .find('.media-body')
+        .text()
+        .trim()
         .replace(/\s\s+/g, ' ')
         .replace(/[\r\n]+/g, ' '),
     ).toContain('This merge request is in the process of being merged');
@@ -31,13 +32,14 @@ describe('MRWidgetMerging', () => {
 
   it('renders branch information', () => {
     expect(
-      vm.$el
-        .querySelector('.mr-info-list')
-        .textContent.trim()
+      wrapper
+        .find('.mr-info-list')
+        .text()
+        .trim()
         .replace(/\s\s+/g, ' ')
         .replace(/[\r\n]+/g, ' '),
     ).toEqual('The changes will be merged into branch');
 
-    expect(vm.$el.querySelector('a').getAttribute('href')).toEqual('/branch-path');
+    expect(wrapper.find('a').attributes('href')).toBe('/branch-path');
   });
 });