Commit ab1a156c authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'xanf-vtu-v1-requirement-form' into 'master'

Upgrading VTU to v1: Fix requirement_form_spec with latest `@vue/test-utils`

See merge request gitlab-org/gitlab!50502
parents c2c04242 6c6023ea
import { nextTick } from 'vue';
import { GlDrawer, GlFormCheckbox } from '@gitlab/ui'; import { GlDrawer, GlFormCheckbox } from '@gitlab/ui';
import { getByText } from '@testing-library/dom'; import { getByText } from '@testing-library/dom';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
...@@ -95,7 +96,7 @@ describe('RequirementForm', () => { ...@@ -95,7 +96,7 @@ describe('RequirementForm', () => {
requirement: mockRequirementsOpen[0], requirement: mockRequirementsOpen[0],
}); });
await wrapper.vm.$nextTick(); await nextTick();
expect(wrapper.vm.requirementObject).toBe(mockRequirementsOpen[0]); expect(wrapper.vm.requirementObject).toBe(mockRequirementsOpen[0]);
}); });
...@@ -105,7 +106,7 @@ describe('RequirementForm', () => { ...@@ -105,7 +106,7 @@ describe('RequirementForm', () => {
requirement: null, requirement: null,
}); });
await wrapper.vm.$nextTick(); await nextTick();
expect(wrapper.vm.requirementObject).toMatchObject({ expect(wrapper.vm.requirementObject).toMatchObject({
iid: '', iid: '',
...@@ -131,7 +132,7 @@ describe('RequirementForm', () => { ...@@ -131,7 +132,7 @@ describe('RequirementForm', () => {
wrapper = createComponent(); wrapper = createComponent();
wrapper.setProps({ requirement, enableRequirementEdit: true }); wrapper.setProps({ requirement, enableRequirementEdit: true });
await wrapper.vm.$nextTick(); await nextTick();
expect(wrapper.find(GlFormCheckbox).vm.$attrs.checked).toBe(satisfied); expect(wrapper.find(GlFormCheckbox).vm.$attrs.checked).toBe(satisfied);
}, },
...@@ -147,7 +148,7 @@ describe('RequirementForm', () => { ...@@ -147,7 +148,7 @@ describe('RequirementForm', () => {
}); });
it('does not render the satisfied checkbox', async () => { it('does not render the satisfied checkbox', async () => {
await wrapper.vm.$nextTick(); await nextTick();
expect(wrapper.find(GlFormCheckbox).exists()).toBe(false); expect(wrapper.find(GlFormCheckbox).exists()).toBe(false);
}); });
}); });
...@@ -159,7 +160,7 @@ describe('RequirementForm', () => { ...@@ -159,7 +160,7 @@ describe('RequirementForm', () => {
drawerOpen: false, drawerOpen: false,
}); });
await wrapper.vm.$nextTick(); await nextTick();
expect(wrapper.vm.satisfied).toBe(false); expect(wrapper.vm.satisfied).toBe(false);
}); });
...@@ -167,11 +168,18 @@ describe('RequirementForm', () => { ...@@ -167,11 +168,18 @@ describe('RequirementForm', () => {
it('binds `keydown` event listener on document when `drawerOpen` prop is changed to true', async () => { it('binds `keydown` event listener on document when `drawerOpen` prop is changed to true', async () => {
jest.spyOn(document, 'addEventListener'); jest.spyOn(document, 'addEventListener');
wrapper.setProps({
drawerOpen: false,
});
await nextTick();
expect(document.addEventListener).not.toHaveBeenCalled();
wrapper.setProps({ wrapper.setProps({
drawerOpen: true, drawerOpen: true,
}); });
await wrapper.vm.$nextTick(); await nextTick();
expect(document.addEventListener).toHaveBeenCalledWith('keydown', expect.any(Function)); expect(document.addEventListener).toHaveBeenCalledWith('keydown', expect.any(Function));
}); });
...@@ -323,7 +331,7 @@ describe('RequirementForm', () => { ...@@ -323,7 +331,7 @@ describe('RequirementForm', () => {
enableRequirementEdit: true, enableRequirementEdit: true,
}); });
await wrapperWithRequirement.vm.$nextTick(); await nextTick();
const issuableBody = wrapperWithRequirement.find(IssuableBody); const issuableBody = wrapperWithRequirement.find(IssuableBody);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment