Skip to content

G
gitlab-ce
Commit de4aac71 authored by Vitaly Slobodin's avatar Vitaly Slobodin
Browse files
Options

Merge branch 'xanf-upgrade-vtu-to-v1' into 'master' 

Upgrade @vue/test-utils to v1.1.2

See merge request gitlab-org/gitlab!50598
parents 47c39953 7af4dc13
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 100 deletions
ee/spec/frontend/analytics/code_review_analytics/components/__snapshots__/merge_request_table_spec.js.snap
View file @ de4aac71
...@@ -4,9 +4,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = ` ...@@ -4,9 +4,9 @@ exports[`MergeRequestTable component template matches the snapshot 1`] = `
<table <table
aria-busy="false" aria-busy="false"
aria-colcount="7" aria-colcount="7"
aria-describedby="__BVID__59__caption_" aria-describedby="__BVID__36__caption_"
class="table b-table gl-table my-3 b-table-stacked-sm" class="table b-table gl-table my-3 b-table-stacked-sm"
id="__BVID__59" id="__BVID__36"
role="table" role="table"
> >
<!----> <!---->
......
ee/spec/frontend/approvals/components/approvers_select_spec.js
View file @ de4aac71
...@@ -63,7 +63,7 @@ describe('Approvals ApproversSelect', () => { ...@@ -63,7 +63,7 @@ describe('Approvals ApproversSelect', () => {
...options, ...options,
propsData, propsData,
localVue, localVue,
attachToDocument: true, attachTo: document.body,
}); });
await waitForPromises(); await waitForPromises();
......
ee/spec/frontend/approvals/components/branches_select_spec.js
View file @ de4aac71
...@@ -34,7 +34,7 @@ describe('Branches Select', () => { ...@@ -34,7 +34,7 @@ describe('Branches Select', () => {
}, },
localVue, localVue,
store: new Vuex.Store(store), store: new Vuex.Store(store),
attachToDocument: true, attachTo: document.body,
}); });
await waitForPromises(); await waitForPromises();
......
ee/spec/frontend/approvals/components/mr_edit/mr_rules_spec.js
View file @ de4aac71
...@@ -27,7 +27,7 @@ describe('EE Approvals MRRules', () => { ...@@ -27,7 +27,7 @@ describe('EE Approvals MRRules', () => {
wrapper = mount(localVue.extend(MRRules), { wrapper = mount(localVue.extend(MRRules), {
localVue, localVue,
store: new Vuex.Store(store), store: new Vuex.Store(store),
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
ee/spec/frontend/groups/components/invite_members_spec.js
View file @ de4aac71
...@@ -53,7 +53,7 @@ describe('User invites', () => { ...@@ -53,7 +53,7 @@ describe('User invites', () => {
beforeEach(() => { beforeEach(() => {
wrapper = mount(Component, { wrapper = mount(Component, {
propsData: { emails: [], docsPath: 'https://some.doc.path' }, propsData: { emails: [], docsPath: 'https://some.doc.path' },
attachToDocument: true, attachTo: document.body,
}); });
clickButton(); clickButton();
......
ee/spec/frontend/related_issues/components/related_issuable_input_spec.js
View file @ de4aac71
...@@ -77,7 +77,7 @@ describe('RelatedIssuableInput', () => { ...@@ -77,7 +77,7 @@ describe('RelatedIssuableInput', () => {
references: ['foo', 'bar'], references: ['foo', 'bar'],
}, },
// We need to attach to document, so that `document.activeElement` is properly set in jsdom // We need to attach to document, so that `document.activeElement` is properly set in jsdom
attachToDocument: true, attachTo: document.body,
}); });
wrapper.find('li').trigger('click'); wrapper.find('li').trigger('click');
......
ee/spec/frontend/threat_monitoring/components/__snapshots__/network_policy_list_spec.js.snap
View file @ de4aac71
...@@ -6,10 +6,10 @@ exports[`NetworkPolicyList component renders policies table 1`] = ` ...@@ -6,10 +6,10 @@ exports[`NetworkPolicyList component renders policies table 1`] = `
<table <table
aria-busy="false" aria-busy="false"
aria-colcount="3" aria-colcount="3"
aria-describedby="__BVID__432__caption_" aria-describedby="__BVID__333__caption_"
aria-multiselectable="false" aria-multiselectable="false"
class="table b-table gl-table table-hover b-table-stacked-md b-table-selectable b-table-select-single" class="table b-table gl-table table-hover b-table-stacked-md b-table-selectable b-table-select-single"
id="__BVID__432" id="__BVID__333"
role="table" role="table"
> >
<!----> <!---->
......
ee/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_container_spec.js
View file @ de4aac71
...@@ -24,7 +24,7 @@ describe('MrWidgetPipelineContainer', () => { ...@@ -24,7 +24,7 @@ describe('MrWidgetPipelineContainer', () => {
provide: { provide: {
...provide, ...provide,
}, },
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/__mocks__/@gitlab/ui.js
View file @ de4aac71
...@@ -2,7 +2,7 @@ export * from '@gitlab/ui'; ...@@ -2,7 +2,7 @@ export * from '@gitlab/ui';
/** /**
* The @gitlab/ui tooltip directive requires awkward and distracting set up in tests * The @gitlab/ui tooltip directive requires awkward and distracting set up in tests
* for components that use it (e.g., `attachToDocument: true` and `sync: true` passed * for components that use it (e.g., `attachTo: document.body` and `sync: true` passed
* to the `mount` helper from `vue-test-utils`). * to the `mount` helper from `vue-test-utils`).
* *
* This mock decouples those tests from the implementation, removing the need to set * This mock decouples those tests from the implementation, removing the need to set
......
spec/frontend/alerts_settings/__snapshots__/alerts_settings_form_spec.js.snap
View file @ de4aac71
...@@ -16,82 +16,84 @@ exports[`AlertsSettingsFormNew with default values renders the initial template ...@@ -16,82 +16,84 @@ exports[`AlertsSettingsFormNew with default values renders the initial template
<!----> <!---->
</div> </div>
</div> </div>
<div class=\\"gl-mt-3 collapse\\" style=\\"display: none;\\" id=\\"__BVID__10\\"> <transition-stub css=\\"true\\" enterclass=\\"\\" leaveclass=\\"collapse show\\" entertoclass=\\"collapse show\\" leavetoclass=\\"collapse\\" enteractiveclass=\\"collapsing\\" leaveactiveclass=\\"collapsing\\" class=\\"gl-mt-3\\">
<div> <div class=\\"collapse\\" style=\\"display: none;\\" id=\\"__BVID__10\\">
<div id=\\"name-integration\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"name-integration__BV_label_\\" for=\\"name-integration\\" class=\\"d-block col-form-label\\">2. Name integration</label> <div>
<div class=\\"bv-no-focus-ring\\"><input type=\\"text\\" placeholder=\\"Enter integration name\\" class=\\"gl-form-input form-control\\" id=\\"__BVID__15\\"> <div id=\\"name-integration\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"name-integration__BV_label_\\" for=\\"name-integration\\" class=\\"d-block col-form-label\\">2. Name integration</label>
<!----> <div class=\\"bv-no-focus-ring\\"><input type=\\"text\\" placeholder=\\"Enter integration name\\" class=\\"gl-form-input form-control\\" id=\\"__BVID__15\\">
<!----> <!---->
<!----> <!---->
<!---->
</div>
</div> </div>
</div> <div id=\\"integration-webhook\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"integration-webhook__BV_label_\\" for=\\"integration-webhook\\" class=\\"d-block col-form-label\\">3. Set up webhook</label>
<div id=\\"integration-webhook\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"integration-webhook__BV_label_\\" for=\\"integration-webhook\\" class=\\"d-block col-form-label\\">3. Set up webhook</label> <div class=\\"bv-no-focus-ring\\"><span>Utilize the URL and authorization key below to authorize an external service to send alerts to GitLab. Review your external service's documentation to learn where to add these details, and the <a rel=\\"noopener noreferrer\\" target=\\"_blank\\" href=\\"https://docs.gitlab.com/ee/operations/incident_management/alert_integrations.html\\" class=\\"gl-link gl-display-inline-block\\">GitLab documentation</a> to learn more about configuring your endpoint.</span> <label class=\\"gl-display-flex gl-flex-direction-column gl-mb-0 gl-w-max-content gl-my-4 gl-font-weight-normal\\">
<div class=\\"bv-no-focus-ring\\"><span>Utilize the URL and authorization key below to authorize an external service to send alerts to GitLab. Review your external service's documentation to learn where to add these details, and the <a rel=\\"noopener noreferrer\\" target=\\"_blank\\" href=\\"https://docs.gitlab.com/ee/operations/incident_management/alert_integrations.html\\" class=\\"gl-link gl-display-inline-block\\">GitLab documentation</a> to learn more about configuring your endpoint.</span> <label class=\\"gl-display-flex gl-flex-direction-column gl-mb-0 gl-w-max-content gl-my-4 gl-font-weight-normal\\"> <div class=\\"gl-toggle-wrapper\\"><span class=\\"gl-toggle-label\\">Active</span>
<div class=\\"gl-toggle-wrapper\\"><span class=\\"gl-toggle-label\\">Active</span> <!----> <button aria-label=\\"Active\\" type=\\"button\\" class=\\"gl-toggle\\"><span class=\\"toggle-icon\\"><svg data-testid=\\"close-icon\\" aria-hidden=\\"true\\" class=\\"gl-icon s16\\"><use href=\\"#close\\"></use></svg></span></button></div>
<!----> <button aria-label=\\"Active\\" type=\\"button\\" class=\\"gl-toggle\\"><span class=\\"toggle-icon\\"><svg data-testid=\\"close-icon\\" aria-hidden=\\"true\\" class=\\"gl-icon s16\\"><use href=\\"#close\\"></use></svg></span></button></div> <!---->
</label>
<!----> <!---->
</label> <div class=\\"gl-my-4\\"><span class=\\"gl-font-weight-bold\\">
<!---->
<div class=\\"gl-my-4\\"><span class=\\"gl-font-weight-bold\\">
Webhook URL Webhook URL
</span> </span>
<div id=\\"url\\" readonly=\\"readonly\\"> <div id=\\"url\\" readonly=\\"readonly\\">
<div role=\\"group\\" class=\\"input-group\\"> <div role=\\"group\\" class=\\"input-group\\">
<!----> <!---->
<!----> <input id=\\"url\\" type=\\"text\\" readonly=\\"readonly\\" class=\\"gl-form-input form-control\\"> <!----> <input id=\\"url\\" type=\\"text\\" readonly=\\"readonly\\" class=\\"gl-form-input form-control\\">
<div class=\\"input-group-append\\"><button title=\\"Copy\\" data-clipboard-text=\\"\\" aria-label=\\"Copy this value\\" type=\\"button\\" class=\\"btn gl-m-0! btn-default btn-md gl-button btn-default-secondary btn-icon\\"> <div class=\\"input-group-append\\"><button title=\\"Copy\\" data-clipboard-text=\\"\\" aria-label=\\"Copy this value\\" type=\\"button\\" class=\\"btn gl-m-0! btn-default btn-md gl-button btn-default-secondary btn-icon\\">
<!----> <svg data-testid=\\"copy-to-clipboard-icon\\" aria-hidden=\\"true\\" class=\\"gl-button-icon gl-icon s16\\"> <!----> <svg data-testid=\\"copy-to-clipboard-icon\\" aria-hidden=\\"true\\" class=\\"gl-button-icon gl-icon s16\\">
<use href=\\"#copy-to-clipboard\\"></use> <use href=\\"#copy-to-clipboard\\"></use>
</svg> </svg>
<!----></button></div> <!----></button></div>
<!----> <!---->
</div>
</div> </div>
</div> </div>
</div> <div class=\\"gl-my-4\\"><span class=\\"gl-font-weight-bold\\">
<div class=\\"gl-my-4\\"><span class=\\"gl-font-weight-bold\\">
Authorization key Authorization key
</span> </span>
<div id=\\"authorization-key\\" readonly=\\"readonly\\" class=\\"gl-mb-3\\"> <div id=\\"authorization-key\\" readonly=\\"readonly\\" class=\\"gl-mb-3\\">
<div role=\\"group\\" class=\\"input-group\\"> <div role=\\"group\\" class=\\"input-group\\">
<!---->
<!----> <input id=\\"authorization-key\\" type=\\"text\\" readonly=\\"readonly\\" class=\\"gl-form-input form-control\\">
<div class=\\"input-group-append\\"><button title=\\"Copy\\" data-clipboard-text=\\"\\" aria-label=\\"Copy this value\\" type=\\"button\\" class=\\"btn gl-m-0! btn-default btn-md gl-button btn-default-secondary btn-icon\\">
<!----> <svg data-testid=\\"copy-to-clipboard-icon\\" aria-hidden=\\"true\\" class=\\"gl-button-icon gl-icon s16\\">
<use href=\\"#copy-to-clipboard\\"></use>
</svg>
<!----></button></div>
<!---->
</div>
</div> <button type=\\"button\\" disabled=\\"disabled\\" class=\\"btn btn-default btn-md disabled gl-button\\">
<!----> <!---->
<!----> <input id=\\"authorization-key\\" type=\\"text\\" readonly=\\"readonly\\" class=\\"gl-form-input form-control\\"> <!----> <span class=\\"gl-button-text\\">
<div class=\\"input-group-append\\"><button title=\\"Copy\\" data-clipboard-text=\\"\\" aria-label=\\"Copy this value\\" type=\\"button\\" class=\\"btn gl-m-0! btn-default btn-md gl-button btn-default-secondary btn-icon\\">
<!----> <svg data-testid=\\"copy-to-clipboard-icon\\" aria-hidden=\\"true\\" class=\\"gl-button-icon gl-icon s16\\">
<use href=\\"#copy-to-clipboard\\"></use>
</svg>
<!----></button></div>
<!---->
</div>
</div> <button type=\\"button\\" disabled=\\"disabled\\" class=\\"btn btn-default btn-md disabled gl-button\\">
<!---->
<!----> <span class=\\"gl-button-text\\">
Reset Key Reset Key
</span></button> </span></button>
<!---->
</div>
<!---->
<!---->
<!---->
</div>
</div>
<div id=\\"test-integration\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"test-integration__BV_label_\\" for=\\"test-integration\\" class=\\"d-block col-form-label\\">4. Sample alert payload (optional)</label>
<div class=\\"bv-no-focus-ring\\"><span>Provide an example payload from the monitoring tool you intend to integrate with. This payload can be used to test the integration (optional).</span> <textarea id=\\"test-payload\\" disabled=\\"disabled\\" placeholder=\\"{ &quot;events&quot;: [{ &quot;application&quot;: &quot;Name of application&quot; }] }\\" wrap=\\"soft\\" class=\\"gl-form-input gl-form-textarea gl-my-3 form-control is-valid\\" style=\\"resize: none; overflow-y: scroll;\\"></textarea>
<!---->
<!---->
<!----> <!---->
</div> </div>
<!---->
<!---->
<!---->
</div> </div>
<!---->
<!---->
</div> </div>
<div id=\\"test-integration\\" role=\\"group\\" class=\\"form-group gl-form-group\\"><label id=\\"test-integration__BV_label_\\" for=\\"test-integration\\" class=\\"d-block col-form-label\\">4. Sample alert payload (optional)</label> <div class=\\"gl-display-flex gl-justify-content-start gl-py-3\\"><button data-testid=\\"integration-form-submit\\" type=\\"submit\\" class=\\"btn js-no-auto-disable btn-success btn-md gl-button\\">
<div class=\\"bv-no-focus-ring\\"><span>Provide an example payload from the monitoring tool you intend to integrate with. This payload can be used to test the integration (optional).</span> <textarea id=\\"test-payload\\" disabled=\\"disabled\\" placeholder=\\"{ &quot;events&quot;: [{ &quot;application&quot;: &quot;Name of application&quot; }] }\\" wrap=\\"soft\\" class=\\"gl-form-input gl-form-textarea gl-my-3 form-control is-valid\\" style=\\"resize: none; overflow-y: scroll;\\"></textarea>
<!----> <!---->
<!----> <span class=\\"gl-button-text\\">Save integration
</span></button> <button data-testid=\\"integration-test-and-submit\\" type=\\"button\\" disabled=\\"disabled\\" class=\\"btn gl-mx-3 js-no-auto-disable btn-success btn-md disabled gl-button btn-success-secondary\\">
<!----> <!---->
<!----> <span class=\\"gl-button-text\\">Save and test payload</span></button> <button type=\\"reset\\" class=\\"btn js-no-auto-disable btn-default btn-md gl-button\\">
<!----> <!---->
</div> <!----> <span class=\\"gl-button-text\\">Cancel</span></button></div>
</div>
<!---->
<!---->
</div> </div>
<div class=\\"gl-display-flex gl-justify-content-start gl-py-3\\"><button data-testid=\\"integration-form-submit\\" type=\\"submit\\" class=\\"btn js-no-auto-disable btn-success btn-md gl-button\\"> </transition-stub>
<!---->
<!----> <span class=\\"gl-button-text\\">Save integration
</span></button> <button data-testid=\\"integration-test-and-submit\\" type=\\"button\\" disabled=\\"disabled\\" class=\\"btn gl-mx-3 js-no-auto-disable btn-success btn-md disabled gl-button btn-success-secondary\\">
<!---->
<!----> <span class=\\"gl-button-text\\">Save and test payload</span></button> <button type=\\"reset\\" class=\\"btn js-no-auto-disable btn-default btn-md gl-button\\">
<!---->
<!----> <span class=\\"gl-button-text\\">Cancel</span></button></div>
</div>
</form>" </form>"
`; `;
spec/frontend/boards/components/board_form_spec.js
View file @ de4aac71
...@@ -71,7 +71,7 @@ describe('BoardForm', () => { ...@@ -71,7 +71,7 @@ describe('BoardForm', () => {
mutate, mutate,
}, },
}, },
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/boards/components/boards_selector_spec.js
View file @ de4aac71
...@@ -94,7 +94,7 @@ describe('BoardsSelector', () => { ...@@ -94,7 +94,7 @@ describe('BoardsSelector', () => {
weights: [], weights: [],
}, },
mocks: { $apollo }, mocks: { $apollo },
attachToDocument: true, attachTo: document.body,
}); });
wrapper.vm.$apollo.addSmartQuery = jest.fn((_, options) => { wrapper.vm.$apollo.addSmartQuery = jest.fn((_, options) => {
......
spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
View file @ de4aac71
...@@ -17,7 +17,7 @@ describe('Ci variable modal', () => { ...@@ -17,7 +17,7 @@ describe('Ci variable modal', () => {
const createComponent = (method, options = {}) => { const createComponent = (method, options = {}) => {
store = createStore(); store = createStore();
wrapper = method(CiVariableModal, { wrapper = method(CiVariableModal, {
attachToDocument: true, attachTo: document.body,
stubs: { stubs: {
GlModal: ModalStub, GlModal: ModalStub,
}, },
......
spec/frontend/ci_variable_list/components/ci_variable_table_spec.js
View file @ de4aac71
...@@ -17,7 +17,7 @@ describe('Ci variable table', () => { ...@@ -17,7 +17,7 @@ describe('Ci variable table', () => {
store.state.isGroup = true; store.state.isGroup = true;
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = mount(CiVariableTable, { wrapper = mount(CiVariableTable, {
attachToDocument: true, attachTo: document.body,
localVue, localVue,
store, store,
}); });
......
spec/frontend/deploy_freeze/components/deploy_freeze_modal_spec.js
View file @ de4aac71
...@@ -19,7 +19,7 @@ describe('Deploy freeze modal', () => { ...@@ -19,7 +19,7 @@ describe('Deploy freeze modal', () => {
timezoneData: timezoneDataFixture, timezoneData: timezoneDataFixture,
}); });
wrapper = shallowMount(DeployFreezeModal, { wrapper = shallowMount(DeployFreezeModal, {
attachToDocument: true, attachTo: document.body,
stubs: { stubs: {
GlModal, GlModal,
}, },
......
spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js
View file @ de4aac71
...@@ -18,7 +18,7 @@ describe('Deploy freeze table', () => { ...@@ -18,7 +18,7 @@ describe('Deploy freeze table', () => {
}); });
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = mount(DeployFreezeTable, { wrapper = mount(DeployFreezeTable, {
attachToDocument: true, attachTo: document.body,
localVue, localVue,
store, store,
}); });
......
spec/frontend/design_management/components/design_notes/design_reply_form_spec.js
View file @ de4aac71
...@@ -36,7 +36,7 @@ describe('Design reply form component', () => { ...@@ -36,7 +36,7 @@ describe('Design reply form component', () => {
it('textarea has focus after component mount', () => { it('textarea has focus after component mount', () => {
// We need to attach to document, so that `document.activeElement` is properly set in jsdom // We need to attach to document, so that `document.activeElement` is properly set in jsdom
createComponent({}, { attachToDocument: true }); createComponent({}, { attachTo: document.body });
expect(findTextarea().element).toEqual(document.activeElement); expect(findTextarea().element).toEqual(document.activeElement);
}); });
......
spec/frontend/design_management/components/list/__snapshots__/item_spec.js.snap
View file @ de4aac71
...@@ -10,7 +10,10 @@ exports[`Design management list item component when item appears in view after i ...@@ -10,7 +10,10 @@ exports[`Design management list item component when item appears in view after i
exports[`Design management list item component with notes renders item with multiple comments 1`] = ` exports[`Design management list item component with notes renders item with multiple comments 1`] = `
<router-link-stub <router-link-stub
ariacurrentvalue="page"
class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new" class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new"
event="click"
tag="a"
to="[object Object]" to="[object Object]"
> >
<div <div
...@@ -81,7 +84,10 @@ exports[`Design management list item component with notes renders item with mult ...@@ -81,7 +84,10 @@ exports[`Design management list item component with notes renders item with mult
exports[`Design management list item component with notes renders item with single comment 1`] = ` exports[`Design management list item component with notes renders item with single comment 1`] = `
<router-link-stub <router-link-stub
ariacurrentvalue="page"
class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new" class="card gl-cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new"
event="click"
tag="a"
to="[object Object]" to="[object Object]"
> >
<div <div
......
spec/frontend/design_management/pages/index_spec.js
View file @ de4aac71
...@@ -160,7 +160,7 @@ describe('Design management index page', () => { ...@@ -160,7 +160,7 @@ describe('Design management index page', () => {
localVue, localVue,
router, router,
stubs: { DesignDestroyer, ApolloMutation, VueDraggable, ...stubs }, stubs: { DesignDestroyer, ApolloMutation, VueDraggable, ...stubs },
attachToDocument: true, attachTo: document.body,
provide: { provide: {
projectPath: 'project-path', projectPath: 'project-path',
issueIid: '1', issueIid: '1',
......
spec/frontend/monitoring/components/charts/stacked_column_spec.js
View file @ de4aac71
...@@ -26,7 +26,7 @@ describe('Stacked column chart component', () => { ...@@ -26,7 +26,7 @@ describe('Stacked column chart component', () => {
stubs: { stubs: {
GlPopover: true, GlPopover: true,
}, },
attachToDocument: true, attachTo: document.body,
}); });
beforeEach(() => { beforeEach(() => {
......
spec/frontend/monitoring/components/charts/time_series_spec.js
View file @ de4aac71
...@@ -53,7 +53,7 @@ describe('Time series component', () => { ...@@ -53,7 +53,7 @@ describe('Time series component', () => {
stubs: { stubs: {
GlPopover: true, GlPopover: true,
}, },
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
View file @ de4aac71
...@@ -11,7 +11,7 @@ const createMountedWrapper = (props = {}) => { ...@@ -11,7 +11,7 @@ const createMountedWrapper = (props = {}) => {
wrapper = mount(DuplicateDashboardForm, { wrapper = mount(DuplicateDashboardForm, {
propsData: { ...props }, propsData: { ...props },
// We need to attach to document, so that `document.activeElement` is properly set in jsdom // We need to attach to document, so that `document.activeElement` is properly set in jsdom
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/pipeline_editor/components/commit/commit_form_spec.js
View file @ de4aac71
...@@ -16,8 +16,8 @@ describe('~/pipeline_editor/pipeline_editor_app.vue', () => { ...@@ -16,8 +16,8 @@ describe('~/pipeline_editor/pipeline_editor_app.vue', () => {
...props, ...props,
}, },
// attachToDocument is required for input/submit events // attachTo is required for input/submit events
attachToDocument: mountFn === mount, attachTo: mountFn === mount ? document.body : null,
}); });
}; };
......
spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
View file @ de4aac71
...@@ -100,8 +100,8 @@ describe('~/pipeline_editor/pipeline_editor_app.vue', () => { ...@@ -100,8 +100,8 @@ describe('~/pipeline_editor/pipeline_editor_app.vue', () => {
mutate: mockMutate, mutate: mockMutate,
}, },
}, },
// attachToDocument is required for input/submit events // attachTo is required for input/submit events
attachToDocument: mountFn === mount, attachTo: mountFn === mount ? document.body : null,
...options, ...options,
}); });
}; };
......
spec/frontend/pipelines/components/dag/dag_graph_spec.js
View file @ de4aac71
...@@ -20,7 +20,7 @@ describe('The DAG graph', () => { ...@@ -20,7 +20,7 @@ describe('The DAG graph', () => {
} }
wrapper = shallowMount(DagGraph, { wrapper = shallowMount(DagGraph, {
attachToDocument: true, attachTo: document.body,
propsData, propsData,
data() { data() {
return { return {
......
spec/frontend/pipelines/components/pipelines_filtered_search_spec.js
View file @ de4aac71
...@@ -26,7 +26,7 @@ describe('Pipelines filtered search', () => { ...@@ -26,7 +26,7 @@ describe('Pipelines filtered search', () => {
projectId: '21', projectId: '21',
params, params,
}, },
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/pipelines/stage_spec.js
View file @ de4aac71
...@@ -26,7 +26,7 @@ describe('Pipelines stage component', () => { ...@@ -26,7 +26,7 @@ describe('Pipelines stage component', () => {
const createComponent = (props = {}) => { const createComponent = (props = {}) => {
wrapper = mount(StageComponent, { wrapper = mount(StageComponent, {
attachToDocument: true, attachTo: document.body,
propsData: { propsData: {
...defaultProps, ...defaultProps,
...props, ...props,
......
spec/frontend/sidebar/sidebar_assignees_spec.js
View file @ de4aac71
...@@ -29,7 +29,7 @@ describe('sidebar assignees', () => { ...@@ -29,7 +29,7 @@ describe('sidebar assignees', () => {
}, },
}, },
// Attaching to document is required because this component emits something from the parent element :/ // Attaching to document is required because this component emits something from the parent element :/
attachToDocument: true, attachTo: document.body,
}); });
}; };
......
spec/frontend/test_setup.js
View file @ de4aac71
...@@ -58,8 +58,18 @@ Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => { ...@@ -58,8 +58,18 @@ Object.entries(jqueryMatchers).forEach(([matcherName, matcherFactory]) => {
expect.extend(customMatchers); expect.extend(customMatchers);
// Tech debt issue TBD testUtilsConfig.deprecationWarningHandler = (method, message) => {
testUtilsConfig.logModifiedComponents = false; const ALLOWED_DEPRECATED_METHODS = [
// https://gitlab.com/gitlab-org/gitlab/-/issues/295679
'finding components with `find` or `get`',
// https://gitlab.com/gitlab-org/gitlab/-/issues/295680
'finding components with `findAll`',
];
if (!ALLOWED_DEPRECATED_METHODS.includes(method)) {
global.console.error(message);
}
};
Object.assign(global, { Object.assign(global, {
requestIdleCallback(cb) { requestIdleCallback(cb) {
......
spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
View file @ de4aac71
...@@ -31,7 +31,7 @@ describe('ProjectSelector component', () => { ...@@ -31,7 +31,7 @@ describe('ProjectSelector component', () => {
showSearchErrorMessage: false, showSearchErrorMessage: false,
totalResults: searchResults.length, totalResults: searchResults.length,
}, },
attachToDocument: true, attachTo: document.body,
}); });
({ vm } = wrapper); ({ vm } = wrapper);
......
spec/frontend/vue_shared/components/tooltip_on_truncate_spec.js
View file @ de4aac71
...@@ -18,7 +18,7 @@ describe('TooltipOnTruncate component', () => { ...@@ -18,7 +18,7 @@ describe('TooltipOnTruncate component', () => {
const createComponent = ({ propsData, ...options } = {}) => { const createComponent = ({ propsData, ...options } = {}) => {
wrapper = shallowMount(TooltipOnTruncate, { wrapper = shallowMount(TooltipOnTruncate, {
attachToDocument: true, attachTo: document.body,
propsData: { propsData: {
...propsData, ...propsData,
}, },
...@@ -44,7 +44,7 @@ describe('TooltipOnTruncate component', () => { ...@@ -44,7 +44,7 @@ describe('TooltipOnTruncate component', () => {
}, },
{ {
propsData: { ...propsData }, propsData: { ...propsData },
attachToDocument: true, attachTo: document.body,
...options, ...options,
}, },
); );
......
spec/frontend/vue_shared/directives/tooltip_spec.js
View file @ de4aac71
...@@ -19,7 +19,7 @@ describe('Tooltip directive', () => { ...@@ -19,7 +19,7 @@ describe('Tooltip directive', () => {
data: () => ({ tooltip: text }), data: () => ({ tooltip: text }),
template, template,
}, },
{ attachToDocument: true }, { attachTo: document.body },
); );
} }
......
spec/frontend/vue_shared/directives/validation_spec.js
View file @ de4aac71
...@@ -36,7 +36,7 @@ describe('validation directive', () => { ...@@ -36,7 +36,7 @@ describe('validation directive', () => {
`, `,
}; };
wrapper = shallowMount(component, { attachToDocument: true }); wrapper = shallowMount(component, { attachTo: document.body });
}; };
afterEach(() => { afterEach(() => {
......
yarn.lock
View file @ de4aac71
...@@ -1423,10 +1423,10 @@ ...@@ -1423,10 +1423,10 @@
source-map "~0.6.1" source-map "~0.6.1"
vue-template-es2015-compiler "^1.9.0" vue-template-es2015-compiler "^1.9.0"
"@vue/test-utils@1.0.0-beta.30": "@vue/test-utils@1.1.2":
version "1.0.0-beta.30" version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz#d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz#fdb487448dceefeaf3d01d465f7c836a3d666dbc"
integrity sha512-Wyvcha9fNk8+kzTDwb3xWGjPkCPzHSYSwKP6MplrPTG/auhqoad7JqUEceZLc6u7AU4km2pPQ8/m9s0RgCZ0NA== integrity sha512-utbIL7zn9c+SjhybPwh48lpWCiluFCbP1yyRNAy1fQsw/6hiNFioaWy05FoVAFIZXC5WwBf+5r4ypfM1j/nI4A==
dependencies: dependencies:
dom-event-types "^1.0.0" dom-event-types "^1.0.0"
lodash "^4.17.15" lodash "^4.17.15"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7