Commit 0734d975 authored by Clement Ho's avatar Clement Ho

Merge branch 'xanf-remove-attachToDocument-196758' into 'master'

Remove useless attachToDocument usage in spec/frontend/monitoring

Closes #196758

See merge request gitlab-org/gitlab!23046
parents cbb6a220 6505f205
...@@ -59,7 +59,6 @@ describe('Time series component', () => { ...@@ -59,7 +59,6 @@ describe('Time series component', () => {
default: mockWidgets, default: mockWidgets,
}, },
store, store,
attachToDocument: true,
}); });
}); });
......
...@@ -63,7 +63,7 @@ describe('Dashboard', () => { ...@@ -63,7 +63,7 @@ describe('Dashboard', () => {
beforeEach(() => { beforeEach(() => {
mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
createShallowWrapper({}, { attachToDocument: true }); createShallowWrapper();
}); });
afterEach(() => { afterEach(() => {
...@@ -79,7 +79,7 @@ describe('Dashboard', () => { ...@@ -79,7 +79,7 @@ describe('Dashboard', () => {
beforeEach(done => { beforeEach(done => {
mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
createShallowWrapper({}, { attachToDocument: true }); createShallowWrapper();
wrapper.vm.$nextTick(done); wrapper.vm.$nextTick(done);
}); });
...@@ -99,7 +99,7 @@ describe('Dashboard', () => { ...@@ -99,7 +99,7 @@ describe('Dashboard', () => {
}); });
it('shows up a loading state', done => { it('shows up a loading state', done => {
createShallowWrapper({ hasMetrics: true }, { attachToDocument: true }); createShallowWrapper({ hasMetrics: true });
wrapper.vm wrapper.vm
.$nextTick() .$nextTick()
...@@ -114,7 +114,7 @@ describe('Dashboard', () => { ...@@ -114,7 +114,7 @@ describe('Dashboard', () => {
it('hides the group panels when showPanels is false', done => { it('hides the group panels when showPanels is false', done => {
createMountedWrapper( createMountedWrapper(
{ hasMetrics: true, showPanels: false }, { hasMetrics: true, showPanels: false },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] }, { stubs: ['graph-group', 'panel-type'] },
); );
setupComponentStore(wrapper); setupComponentStore(wrapper);
...@@ -136,10 +136,7 @@ describe('Dashboard', () => { ...@@ -136,10 +136,7 @@ describe('Dashboard', () => {
it('fetches the metrics data with proper time window', done => { it('fetches the metrics data with proper time window', done => {
jest.spyOn(store, 'dispatch'); jest.spyOn(store, 'dispatch');
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
wrapper.vm.$store.commit( wrapper.vm.$store.commit(
`monitoringDashboard/${types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS}`, `monitoringDashboard/${types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS}`,
...@@ -161,10 +158,7 @@ describe('Dashboard', () => { ...@@ -161,10 +158,7 @@ describe('Dashboard', () => {
beforeEach(() => { beforeEach(() => {
mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
setupComponentStore(wrapper); setupComponentStore(wrapper);
}); });
...@@ -216,10 +210,7 @@ describe('Dashboard', () => { ...@@ -216,10 +210,7 @@ describe('Dashboard', () => {
}); });
it('hides the environments dropdown list when there is no environments', done => { it('hides the environments dropdown list when there is no environments', done => {
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
wrapper.vm.$store.commit( wrapper.vm.$store.commit(
`monitoringDashboard/${types.RECEIVE_METRICS_DATA_SUCCESS}`, `monitoringDashboard/${types.RECEIVE_METRICS_DATA_SUCCESS}`,
...@@ -244,10 +235,7 @@ describe('Dashboard', () => { ...@@ -244,10 +235,7 @@ describe('Dashboard', () => {
}); });
it('renders the datetimepicker dropdown', done => { it('renders the datetimepicker dropdown', done => {
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
setupComponentStore(wrapper); setupComponentStore(wrapper);
...@@ -264,7 +252,7 @@ describe('Dashboard', () => { ...@@ -264,7 +252,7 @@ describe('Dashboard', () => {
beforeEach(done => { beforeEach(done => {
mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
createShallowWrapper({ hasMetrics: true }, { attachToDocument: true }); createShallowWrapper({ hasMetrics: true });
setupComponentStore(wrapper); setupComponentStore(wrapper);
wrapper.vm.$nextTick(done); wrapper.vm.$nextTick(done);
...@@ -298,7 +286,7 @@ describe('Dashboard', () => { ...@@ -298,7 +286,7 @@ describe('Dashboard', () => {
}); });
beforeEach(done => { beforeEach(done => {
createShallowWrapper({ hasMetrics: true }, { attachToDocument: true }); createShallowWrapper({ hasMetrics: true });
setupComponentStore(wrapper); setupComponentStore(wrapper);
...@@ -415,7 +403,7 @@ describe('Dashboard', () => { ...@@ -415,7 +403,7 @@ describe('Dashboard', () => {
beforeEach(done => { beforeEach(done => {
mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
createShallowWrapper({ hasMetrics: true }, { attachToDocument: true }); createShallowWrapper({ hasMetrics: true });
wrapper.vm.$store.commit( wrapper.vm.$store.commit(
`monitoringDashboard/${types.SET_ALL_DASHBOARDS}`, `monitoringDashboard/${types.SET_ALL_DASHBOARDS}`,
...@@ -452,10 +440,7 @@ describe('Dashboard', () => { ...@@ -452,10 +440,7 @@ describe('Dashboard', () => {
beforeEach(() => { beforeEach(() => {
mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
wrapper.vm.$store.commit( wrapper.vm.$store.commit(
`monitoringDashboard/${types.SET_ALL_DASHBOARDS}`, `monitoringDashboard/${types.SET_ALL_DASHBOARDS}`,
...@@ -487,7 +472,7 @@ describe('Dashboard', () => { ...@@ -487,7 +472,7 @@ describe('Dashboard', () => {
showTimeWindowDropdown: false, showTimeWindowDropdown: false,
externalDashboardUrl: '/mockUrl', externalDashboardUrl: '/mockUrl',
}, },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] }, { stubs: ['graph-group', 'panel-type'] },
); );
}); });
...@@ -517,7 +502,7 @@ describe('Dashboard', () => { ...@@ -517,7 +502,7 @@ describe('Dashboard', () => {
beforeEach(done => { beforeEach(done => {
mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
createShallowWrapper({ hasMetrics: true, currentDashboard }, { attachToDocument: true }); createShallowWrapper({ hasMetrics: true, currentDashboard });
setTimeout(done); setTimeout(done);
}); });
......
...@@ -38,10 +38,7 @@ describe('dashboard invalid url parameters', () => { ...@@ -38,10 +38,7 @@ describe('dashboard invalid url parameters', () => {
}); });
it('shows an error message if invalid url parameters are passed', done => { it('shows an error message if invalid url parameters are passed', done => {
createMountedWrapper( createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
wrapper.vm wrapper.vm
.$nextTick() .$nextTick()
......
...@@ -45,10 +45,7 @@ describe('dashboard time window', () => { ...@@ -45,10 +45,7 @@ describe('dashboard time window', () => {
it('shows an error message if invalid url parameters are passed', done => { it('shows an error message if invalid url parameters are passed', done => {
mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
createComponentWrapperMounted( createComponentWrapperMounted({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
{ hasMetrics: true },
{ attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
);
setupComponentStore(wrapper); setupComponentStore(wrapper);
......
...@@ -26,7 +26,6 @@ describe('Panel Type component', () => { ...@@ -26,7 +26,6 @@ describe('Panel Type component', () => {
...props, ...props,
}, },
store, store,
attachToDocument: true,
}); });
beforeEach(() => { beforeEach(() => {
...@@ -151,7 +150,6 @@ describe('Panel Type component', () => { ...@@ -151,7 +150,6 @@ describe('Panel Type component', () => {
graphData: graphDataPrometheusQueryRange, graphData: graphDataPrometheusQueryRange,
}, },
store, store,
attachToDocument: true,
}); });
panelType.vm.$nextTick(done); panelType.vm.$nextTick(done);
}); });
......
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