diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js | 38 |
1 files changed, 20 insertions, 18 deletions
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'); }); }); |