diff options
Diffstat (limited to 'spec/frontend/milestones')
-rw-r--r-- | spec/frontend/milestones/components/delete_milestone_modal_spec.js | 37 | ||||
-rw-r--r-- | spec/frontend/milestones/components/milestone_combobox_spec.js | 22 |
2 files changed, 27 insertions, 32 deletions
diff --git a/spec/frontend/milestones/components/delete_milestone_modal_spec.js b/spec/frontend/milestones/components/delete_milestone_modal_spec.js index 8978de0e0e0..b9ba0833c4f 100644 --- a/spec/frontend/milestones/components/delete_milestone_modal_spec.js +++ b/spec/frontend/milestones/components/delete_milestone_modal_spec.js @@ -32,7 +32,7 @@ describe('delete_milestone_modal.vue', () => { jest.spyOn(eventHub, '$emit').mockImplementation(() => {}); }); - it('deletes milestone and redirects to overview page', (done) => { + it('deletes milestone and redirects to overview page', async () => { const responseURL = `${TEST_HOST}/delete_milestone_modal.vue/milestoneOverview`; jest.spyOn(axios, 'delete').mockImplementation((url) => { expect(url).toBe(props.milestoneUrl); @@ -48,19 +48,15 @@ describe('delete_milestone_modal.vue', () => { }); }); - vm.onSubmit() - .then(() => { - expect(redirectTo).toHaveBeenCalledWith(responseURL); - expect(eventHub.$emit).toHaveBeenCalledWith('deleteMilestoneModal.requestFinished', { - milestoneUrl: props.milestoneUrl, - successful: true, - }); - }) - .then(done) - .catch(done.fail); + await vm.onSubmit(); + expect(redirectTo).toHaveBeenCalledWith(responseURL); + expect(eventHub.$emit).toHaveBeenCalledWith('deleteMilestoneModal.requestFinished', { + milestoneUrl: props.milestoneUrl, + successful: true, + }); }); - it('displays error if deleting milestone failed', (done) => { + it('displays error if deleting milestone failed', async () => { const dummyError = new Error('deleting milestone failed'); dummyError.response = { status: 418 }; jest.spyOn(axios, 'delete').mockImplementation((url) => { @@ -73,17 +69,12 @@ describe('delete_milestone_modal.vue', () => { return Promise.reject(dummyError); }); - vm.onSubmit() - .catch((error) => { - expect(error).toBe(dummyError); - expect(redirectTo).not.toHaveBeenCalled(); - expect(eventHub.$emit).toHaveBeenCalledWith('deleteMilestoneModal.requestFinished', { - milestoneUrl: props.milestoneUrl, - successful: false, - }); - }) - .then(done) - .catch(done.fail); + await expect(vm.onSubmit()).rejects.toEqual(dummyError); + expect(redirectTo).not.toHaveBeenCalled(); + expect(eventHub.$emit).toHaveBeenCalledWith('deleteMilestoneModal.requestFinished', { + milestoneUrl: props.milestoneUrl, + successful: false, + }); }); }); diff --git a/spec/frontend/milestones/components/milestone_combobox_spec.js b/spec/frontend/milestones/components/milestone_combobox_spec.js index 1af39aff30c..afd85fb78ce 100644 --- a/spec/frontend/milestones/components/milestone_combobox_spec.js +++ b/spec/frontend/milestones/components/milestone_combobox_spec.js @@ -340,7 +340,9 @@ describe('Milestone combobox component', () => { await nextTick(); expect( - findFirstProjectMilestonesDropdownItem().find('span').classes('selected-item'), + findFirstProjectMilestonesDropdownItem() + .find('svg') + .classes('gl-new-dropdown-item-check-icon'), ).toBe(true); selectFirstProjectMilestone(); @@ -348,8 +350,8 @@ describe('Milestone combobox component', () => { await nextTick(); expect( - findFirstProjectMilestonesDropdownItem().find('span').classes('selected-item'), - ).toBe(false); + findFirstProjectMilestonesDropdownItem().find('svg').classes('gl-visibility-hidden'), + ).toBe(true); }); describe('when a project milestones is selected', () => { @@ -464,17 +466,19 @@ describe('Milestone combobox component', () => { await nextTick(); - expect(findFirstGroupMilestonesDropdownItem().find('span').classes('selected-item')).toBe( - true, - ); + expect( + findFirstGroupMilestonesDropdownItem() + .find('svg') + .classes('gl-new-dropdown-item-check-icon'), + ).toBe(true); selectFirstGroupMilestone(); await nextTick(); - expect(findFirstGroupMilestonesDropdownItem().find('span').classes('selected-item')).toBe( - false, - ); + expect( + findFirstGroupMilestonesDropdownItem().find('svg').classes('gl-visibility-hidden'), + ).toBe(true); }); describe('when a group milestones is selected', () => { |