Add latest changes from gitlab-org/gitlab@master

10 files changed, 17 insertions, 46 deletions

diff --git a/spec/frontend/environments/environment_monitoring_spec.js b/spec/frontend/environments/environment_monitoring_spec.js
index 9dea02ff66a..d2129bd7b30 100644
--- a/spec/frontend/environments/environment_monitoring_spec.js
+++ b/spec/frontend/environments/environment_monitoring_spec.js
@@ -9,7 +9,6 @@ describe('Monitoring Component', () => {
 
   const createWrapper = () => {
     wrapper = shallowMount(MonitoringComponent, {
-      attachToDocument: true,
       propsData: {
         monitoringUrl,
       },
diff --git a/spec/frontend/environments/environment_rollback_spec.js b/spec/frontend/environments/environment_rollback_spec.js
index a165e94016e..fb62a096c3d 100644
--- a/spec/frontend/environments/environment_rollback_spec.js
+++ b/spec/frontend/environments/environment_rollback_spec.js
@@ -13,7 +13,6 @@ describe('Rollback Component', () => {
         isLastDeployment: true,
         environment: {},
       },
-      attachToDocument: true,
     });
 
     expect(wrapper.element).toHaveSpriteIcon('repeat');
@@ -26,7 +25,6 @@ describe('Rollback Component', () => {
         isLastDeployment: false,
         environment: {},
       },
-      attachToDocument: true,
     });
 
     expect(wrapper.element).toHaveSpriteIcon('redo');
diff --git a/spec/frontend/environments/environment_stop_spec.js b/spec/frontend/environments/environment_stop_spec.js
index 0b9b3078a09..f971cf56b65 100644
--- a/spec/frontend/environments/environment_stop_spec.js
+++ b/spec/frontend/environments/environment_stop_spec.js
@@ -11,7 +11,6 @@ describe('Stop Component', () => {
 
   const createWrapper = () => {
     wrapper = shallowMount(StopComponent, {
-      attachToDocument: true,
       propsData: {
         environment: {},
       },
diff --git a/spec/frontend/environments/environment_terminal_button_spec.js b/spec/frontend/environments/environment_terminal_button_spec.js
index c890334c484..007fda2f2cc 100644
--- a/spec/frontend/environments/environment_terminal_button_spec.js
+++ b/spec/frontend/environments/environment_terminal_button_spec.js
@@ -7,7 +7,6 @@ describe('Stop Component', () => {
 
   const mountWithProps = props => {
     wrapper = shallowMount(TerminalComponent, {
-      attachToDocument: true,
       propsData: props,
     });
   };
diff --git a/spec/frontend/monitoring/components/charts/time_series_spec.js b/spec/frontend/monitoring/components/charts/time_series_spec.js
index 12f83a07d23..d9960b3d18e 100644
--- a/spec/frontend/monitoring/components/charts/time_series_spec.js
+++ b/spec/frontend/monitoring/components/charts/time_series_spec.js
@@ -59,7 +59,6 @@ describe('Time series component', () => {
           default: mockWidgets,
         },
         store,
-        attachToDocument: true,
       });
   });
 
diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 030b68bcd5a..85408d57dde 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -63,7 +63,7 @@ describe('Dashboard', () => {
     beforeEach(() => {
       mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
 
-      createShallowWrapper({}, { attachToDocument: true });
+      createShallowWrapper();
     });
 
     afterEach(() => {
@@ -79,7 +79,7 @@ describe('Dashboard', () => {
     beforeEach(done => {
       mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
 
-      createShallowWrapper({}, { attachToDocument: true });
+      createShallowWrapper();
 
       wrapper.vm.$nextTick(done);
     });
@@ -99,7 +99,7 @@ describe('Dashboard', () => {
     });
 
     it('shows up a loading state', done => {
-      createShallowWrapper({ hasMetrics: true }, { attachToDocument: true });
+      createShallowWrapper({ hasMetrics: true });
 
       wrapper.vm
         .$nextTick()
@@ -114,7 +114,7 @@ describe('Dashboard', () => {
     it('hides the group panels when showPanels is false', done => {
       createMountedWrapper(
         { hasMetrics: true, showPanels: false },
-        { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
+        { stubs: ['graph-group', 'panel-type'] },
       );
 
       setupComponentStore(wrapper);
@@ -136,10 +136,7 @@ describe('Dashboard', () => {
     it('fetches the metrics data with proper time window', done => {
       jest.spyOn(store, 'dispatch');
 
-      createMountedWrapper(
-        { hasMetrics: true },
-        { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-      );
+      createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
       wrapper.vm.$store.commit(
         `monitoringDashboard/${types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS}`,
@@ -161,10 +158,7 @@ describe('Dashboard', () => {
     beforeEach(() => {
       mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
 
-      createMountedWrapper(
-        { hasMetrics: true },
-        { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-      );
+      createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
       setupComponentStore(wrapper);
     });
@@ -216,10 +210,7 @@ describe('Dashboard', () => {
   });
 
   it('hides the environments dropdown list when there is no environments', done => {
-    createMountedWrapper(
-      { hasMetrics: true },
-      { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-    );
+    createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
     wrapper.vm.$store.commit(
       `monitoringDashboard/${types.RECEIVE_METRICS_DATA_SUCCESS}`,
@@ -244,10 +235,7 @@ describe('Dashboard', () => {
   });
 
   it('renders the datetimepicker dropdown', done => {
-    createMountedWrapper(
-      { hasMetrics: true },
-      { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-    );
+    createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
     setupComponentStore(wrapper);
 
@@ -264,7 +252,7 @@ describe('Dashboard', () => {
     beforeEach(done => {
       mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
 
-      createShallowWrapper({ hasMetrics: true }, { attachToDocument: true });
+      createShallowWrapper({ hasMetrics: true });
       setupComponentStore(wrapper);
 
       wrapper.vm.$nextTick(done);
@@ -298,7 +286,7 @@ describe('Dashboard', () => {
     });
 
     beforeEach(done => {
-      createShallowWrapper({ hasMetrics: true }, { attachToDocument: true });
+      createShallowWrapper({ hasMetrics: true });
 
       setupComponentStore(wrapper);
 
@@ -415,7 +403,7 @@ describe('Dashboard', () => {
     beforeEach(done => {
       mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
 
-      createShallowWrapper({ hasMetrics: true }, { attachToDocument: true });
+      createShallowWrapper({ hasMetrics: true });
 
       wrapper.vm.$store.commit(
         `monitoringDashboard/${types.SET_ALL_DASHBOARDS}`,
@@ -452,10 +440,7 @@ describe('Dashboard', () => {
     beforeEach(() => {
       mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
 
-      createMountedWrapper(
-        { hasMetrics: true },
-        { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-      );
+      createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
       wrapper.vm.$store.commit(
         `monitoringDashboard/${types.SET_ALL_DASHBOARDS}`,
@@ -487,7 +472,7 @@ describe('Dashboard', () => {
           showTimeWindowDropdown: false,
           externalDashboardUrl: '/mockUrl',
         },
-        { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
+        { stubs: ['graph-group', 'panel-type'] },
       );
     });
 
@@ -517,7 +502,7 @@ describe('Dashboard', () => {
     beforeEach(done => {
       mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
 
-      createShallowWrapper({ hasMetrics: true, currentDashboard }, { attachToDocument: true });
+      createShallowWrapper({ hasMetrics: true, currentDashboard });
 
       setTimeout(done);
     });
diff --git a/spec/frontend/monitoring/components/dashboard_time_url_spec.js b/spec/frontend/monitoring/components/dashboard_time_url_spec.js
index 07b39c959be..2da377eb79f 100644
--- a/spec/frontend/monitoring/components/dashboard_time_url_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_time_url_spec.js
@@ -38,10 +38,7 @@ describe('dashboard invalid url parameters', () => {
   });
 
   it('shows an error message if invalid url parameters are passed', done => {
-    createMountedWrapper(
-      { hasMetrics: true },
-      { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-    );
+    createMountedWrapper({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
     wrapper.vm
       .$nextTick()
diff --git a/spec/frontend/monitoring/components/dashboard_time_window_spec.js b/spec/frontend/monitoring/components/dashboard_time_window_spec.js
index c297b47eee0..4acc2d75b73 100644
--- a/spec/frontend/monitoring/components/dashboard_time_window_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_time_window_spec.js
@@ -45,10 +45,7 @@ describe('dashboard time window', () => {
   it('shows an error message if invalid url parameters are passed', done => {
     mock.onGet(mockApiEndpoint).reply(statusCodes.OK, metricsGroupsAPIResponse);
 
-    createComponentWrapperMounted(
-      { hasMetrics: true },
-      { attachToDocument: true, stubs: ['graph-group', 'panel-type'] },
-    );
+    createComponentWrapperMounted({ hasMetrics: true }, { stubs: ['graph-group', 'panel-type'] });
 
     setupComponentStore(wrapper);
 
diff --git a/spec/frontend/monitoring/panel_type_spec.js b/spec/frontend/monitoring/panel_type_spec.js
index 04642d071aa..e51b69ef14d 100644
--- a/spec/frontend/monitoring/panel_type_spec.js
+++ b/spec/frontend/monitoring/panel_type_spec.js
@@ -26,7 +26,6 @@ describe('Panel Type component', () => {
         ...props,
       },
       store,
-      attachToDocument: true,
     });
 
   beforeEach(() => {
@@ -151,7 +150,6 @@ describe('Panel Type component', () => {
           graphData: graphDataPrometheusQueryRange,
         },
         store,
-        attachToDocument: true,
       });
       panelType.vm.$nextTick(done);
     });
diff --git a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
index 0453ac87436..53c176fc46f 100644
--- a/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
+++ b/spec/migrations/20190924152703_migrate_issue_trackers_data_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20190924152703_migrate_issue_trackers_data.rb')
 
-describe MigrateIssueTrackersData, :migration do
+describe MigrateIssueTrackersData, :migration, :sidekiq do
   let(:services) { table(:services) }
   let(:migration_class) { Gitlab::BackgroundMigration::MigrateIssueTrackersSensitiveData }
   let(:migration_name)  { migration_class.to_s.demodulize }