diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 09:45:46 +0000 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
download | gitlab-ce-a7b3560714b4d9cc4ab32dffcd1f74a284b93580.tar.gz |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js index 4070ca8d8dc..4998147c6b6 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js @@ -1,4 +1,5 @@ -import Vue from 'vue'; +import Vue, { nextTick } from 'vue'; +import waitForPromises from 'helpers/wait_for_promises'; import WorkInProgress from '~/vue_merge_request_widget/components/states/work_in_progress.vue'; import toast from '~/vue_shared/plugins/global_toast'; import eventHub from '~/vue_merge_request_widget/event_hub'; @@ -47,7 +48,7 @@ describe('Wip', () => { }; describe('handleRemoveDraft', () => { - it('should make a request to service and handle response', (done) => { + it('should make a request to service and handle response', async () => { const vm = createComponent(); jest.spyOn(eventHub, '$emit').mockImplementation(() => {}); @@ -60,12 +61,12 @@ describe('Wip', () => { ); vm.handleRemoveDraft(); - setImmediate(() => { - expect(vm.isMakingRequest).toBeTruthy(); - expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); - expect(toast).toHaveBeenCalledWith('Marked as ready. Merging is now allowed.'); - done(); - }); + + await waitForPromises(); + + expect(vm.isMakingRequest).toBeTruthy(); + expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); + expect(toast).toHaveBeenCalledWith('Marked as ready. Merging is now allowed.'); }); }); }); @@ -91,13 +92,12 @@ describe('Wip', () => { ); }); - it('should not show removeWIP button is user cannot update MR', (done) => { + it('should not show removeWIP button is user cannot update MR', async () => { vm.mr.removeWIPPath = ''; - Vue.nextTick(() => { - expect(el.querySelector('.js-remove-draft')).toEqual(null); - done(); - }); + await nextTick(); + + expect(el.querySelector('.js-remove-draft')).toEqual(null); }); }); }); |