diff options
Diffstat (limited to 'spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js')
-rw-r--r-- | spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js index 4d780a674be..4df04cd5257 100644 --- a/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js +++ b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js @@ -1,4 +1,4 @@ -import { mount, createLocalVue } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import mockData from 'test_fixtures/issues/related_merge_requests.json'; import axios from '~/lib/utils/axios_utils'; @@ -7,13 +7,12 @@ import createStore from '~/issues/related_merge_requests/store/index'; import RelatedIssuableItem from '~/issuable/components/related_issuable_item.vue'; const API_ENDPOINT = '/api/v4/projects/2/issues/33/related_merge_requests'; -const localVue = createLocalVue(); describe('RelatedMergeRequests', () => { let wrapper; let mock; - beforeEach((done) => { + beforeEach(() => { // put the fixture in DOM as the component expects document.body.innerHTML = `<div id="js-issuable-app"></div>`; document.getElementById('js-issuable-app').dataset.initial = JSON.stringify(mockData); @@ -21,8 +20,7 @@ describe('RelatedMergeRequests', () => { mock = new MockAdapter(axios); mock.onGet(`${API_ENDPOINT}?per_page=100`).reply(200, mockData, { 'x-total': 2 }); - wrapper = mount(localVue.extend(RelatedMergeRequests), { - localVue, + wrapper = mount(RelatedMergeRequests, { store: createStore(), propsData: { endpoint: API_ENDPOINT, @@ -31,7 +29,7 @@ describe('RelatedMergeRequests', () => { }, }); - setImmediate(done); + return axios.waitForAll(); }); afterEach(() => { |