Add latest changes from gitlab-org/gitlab@master

8 files changed, 49 insertions, 58 deletions

diff --git a/spec/frontend/monitoring/alert_widget_spec.js b/spec/frontend/monitoring/alert_widget_spec.js
index d004b1da0b6..e66c389a4ab 100644
--- a/spec/frontend/monitoring/alert_widget_spec.js
+++ b/spec/frontend/monitoring/alert_widget_spec.js
@@ -28,12 +28,20 @@ describe('AlertWidget', () => {
 
   const nonFiringAlertResult = [
     {
-      values: [[0, 1], [1, 42], [2, 41]],
+      values: [
+        [0, 1],
+        [1, 42],
+        [2, 41],
+      ],
     },
   ];
   const firingAlertResult = [
     {
-      values: [[0, 42], [1, 43], [2, 44]],
+      values: [
+        [0, 42],
+        [1, 43],
+        [2, 44],
+      ],
     },
   ];
   const metricId = '5';
@@ -88,10 +96,7 @@ describe('AlertWidget', () => {
   const findWidgetForm = () => wrapper.find({ ref: 'widgetForm' });
   const findAlertErrorMessage = () => wrapper.find({ ref: 'alertErrorMessage' });
   const findCurrentSettingsText = () =>
-    wrapper
-      .find({ ref: 'alertCurrentSetting' })
-      .text()
-      .replace(/\s\s+/g, ' ');
+    wrapper.find({ ref: 'alertCurrentSetting' }).text().replace(/\s\s+/g, ' ');
   const findBadge = () => wrapper.find(GlBadge);
   const findTooltip = () => wrapper.find(GlTooltip);
 
@@ -300,11 +305,7 @@ describe('AlertWidget', () => {
       createComponent(propsWithManyAlerts);
 
       return waitForPromises().then(() => {
-        expect(
-          findTooltip()
-            .text()
-            .replace(/\s\s+/g, ' '),
-        ).toEqual('Firing: alert-label > 42');
+        expect(findTooltip().text().replace(/\s\s+/g, ' ')).toEqual('Firing: alert-label > 42');
       });
     });
   });
diff --git a/spec/frontend/monitoring/components/dashboard_panel_spec.js b/spec/frontend/monitoring/components/dashboard_panel_spec.js
index 1808faf8f0e..0936e390770 100644
--- a/spec/frontend/monitoring/components/dashboard_panel_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_panel_spec.js
@@ -777,11 +777,7 @@ describe('Dashboard Panel', () => {
         await wrapper.vm.$nextTick();
 
         expect(findRunbookLinks().length).toBe(1);
-        expect(
-          findRunbookLinks()
-            .at(0)
-            .attributes('href'),
-        ).toBe(invalidUrl);
+        expect(findRunbookLinks().at(0).attributes('href')).toBe(invalidUrl);
       });
     });
   });
diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 27e479ba498..0552d1621bf 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -587,12 +587,9 @@ describe('Dashboard', () => {
     });
 
     it('group empty area displays a NO_DATA state', () => {
-      expect(
-        wrapper
-          .findAll({ ref: 'empty-group' })
-          .at(0)
-          .props('selectedState'),
-      ).toEqual(metricStates.NO_DATA);
+      expect(wrapper.findAll({ ref: 'empty-group' }).at(0).props('selectedState')).toEqual(
+        metricStates.NO_DATA,
+      );
     });
   });
 
@@ -634,9 +631,7 @@ describe('Dashboard', () => {
 
       describe('when rearrange button is clicked', () => {
         const findFirstDraggableRemoveButton = () =>
-          findDraggablePanels()
-            .at(0)
-            .find('.js-draggable-remove');
+          findDraggablePanels().at(0).find('.js-draggable-remove');
 
         beforeEach(() => {
           findRearrangeButton().vm.$emit('click');
@@ -668,11 +663,7 @@ describe('Dashboard', () => {
         });
 
         it('shows a remove button, which removes a panel', () => {
-          expect(
-            findFirstDraggableRemoveButton()
-              .find('a')
-              .exists(),
-          ).toBe(true);
+          expect(findFirstDraggableRemoveButton().find('a').exists()).toBe(true);
 
           expect(findDraggablePanels().length).toEqual(metricsDashboardPanelCount);
           findFirstDraggableRemoveButton().trigger('click');
@@ -772,10 +763,7 @@ describe('Dashboard', () => {
     const panelIndex = 1; // skip expanded panel
 
     const getClipboardTextFirstPanel = () =>
-      wrapper
-        .findAll(DashboardPanel)
-        .at(panelIndex)
-        .props('clipboardText');
+      wrapper.findAll(DashboardPanel).at(panelIndex).props('clipboardText');
 
     beforeEach(() => {
       setupStoreWithData(store);
diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
index d8ffb4443ac..442269d93fa 100644
--- a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
+++ b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
@@ -101,9 +101,7 @@ describe('duplicate dashboard modal', () => {
       commitMessage: 'A commit message',
     };
 
-    findModal()
-      .find(DuplicateDashboardForm)
-      .vm.$emit('change', formVals);
+    findModal().find(DuplicateDashboardForm).vm.$emit('change', formVals);
 
     // Binding's second argument contains the modal id
     expect(wrapper.vm.form).toEqual(formVals);
diff --git a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
index cc384aef231..690df5045ae 100644
--- a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
+++ b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js
@@ -10,7 +10,10 @@ describe('Custom variable component', () => {
     label: 'Select environment',
     value: 'Production',
     options: {
-      values: [{ text: 'Production', value: 'prod' }, { text: 'Canary', value: 'canary' }],
+      values: [
+        { text: 'Production', value: 'prod' },
+        { text: 'Canary', value: 'canary' },
+      ],
     },
   };
 
@@ -54,9 +57,7 @@ describe('Custom variable component', () => {
     createShallowWrapper();
     jest.spyOn(wrapper.vm, '$emit');
 
-    findDropdownItems()
-      .at(1)
-      .vm.$emit('click');
+    findDropdownItems().at(1).vm.$emit('click');
 
     return wrapper.vm.$nextTick(() => {
       expect(wrapper.vm.$emit).toHaveBeenCalledWith('input', 'canary');
diff --git a/spec/frontend/monitoring/router_spec.js b/spec/frontend/monitoring/router_spec.js
index 8b97c8ed125..c30c4c56a6c 100644
--- a/spec/frontend/monitoring/router_spec.js
+++ b/spec/frontend/monitoring/router_spec.js
@@ -63,12 +63,7 @@ describe('Monitoring router', () => {
       });
 
       expect(wrapper.find(DashboardPage).exists()).toBe(true);
-      expect(
-        wrapper
-          .find(DashboardPage)
-          .find(Dashboard)
-          .exists(),
-      ).toBe(true);
+      expect(wrapper.find(DashboardPage).find(Dashboard).exists()).toBe(true);
     });
   });
 
@@ -91,12 +86,7 @@ describe('Monitoring router', () => {
       });
 
       expect(wrapper.find(DashboardPage).exists()).toBe(true);
-      expect(
-        wrapper
-          .find(DashboardPage)
-          .find(Dashboard)
-          .exists(),
-      ).toBe(true);
+      expect(wrapper.find(DashboardPage).find(Dashboard).exists()).toBe(true);
     });
   });
 
diff --git a/spec/frontend/monitoring/store/mutations_spec.js b/spec/frontend/monitoring/store/mutations_spec.js
index 8d1351fc909..984e52e7bef 100644
--- a/spec/frontend/monitoring/store/mutations_spec.js
+++ b/spec/frontend/monitoring/store/mutations_spec.js
@@ -465,7 +465,10 @@ describe('Monitoring mutations', () => {
       });
 
       expect(variable.options).toEqual({
-        values: [{ text: 'prometheus', value: 'prometheus' }, { text: 'node', value: 'node' }],
+        values: [
+          { text: 'prometheus', value: 'prometheus' },
+          { text: 'node', value: 'node' },
+        ],
       });
     });
   });
diff --git a/spec/frontend/monitoring/store/utils_spec.js b/spec/frontend/monitoring/store/utils_spec.js
index b97948fa1bf..80b15e76879 100644
--- a/spec/frontend/monitoring/store/utils_spec.js
+++ b/spec/frontend/monitoring/store/utils_spec.js
@@ -775,7 +775,11 @@ describe('normalizeQueryResponseData', () => {
             job: 'prometheus',
             instance: 'localhost:9090',
           },
-          values: [[1435781430.781, '1'], [1435781445.781, '2'], [1435781460.781, '3']],
+          values: [
+            [1435781430.781, '1'],
+            [1435781445.781, '2'],
+            [1435781460.781, '3'],
+          ],
         },
         {
           metric: {
@@ -783,7 +787,11 @@ describe('normalizeQueryResponseData', () => {
             job: 'node',
             instance: 'localhost:9091',
           },
-          values: [[1435781430.781, '4'], [1435781445.781, '5'], [1435781460.781, '6']],
+          values: [
+            [1435781430.781, '4'],
+            [1435781445.781, '5'],
+            [1435781460.781, '6'],
+          ],
         },
       ],
     };
@@ -840,7 +848,10 @@ describe('normalizeQueryResponseData', () => {
             job: 'prometheus',
             instance: 'localhost:9090',
           },
-          values: [[1435781430.781, '1'], [1435781460.781, 'NaN']],
+          values: [
+            [1435781430.781, '1'],
+            [1435781460.781, 'NaN'],
+          ],
         },
       ],
     };
@@ -849,7 +860,10 @@ describe('normalizeQueryResponseData', () => {
       {
         metric: { __name__: 'up', instance: 'localhost:9090', job: 'prometheus' },
         value: ['2015-07-01T20:11:00.781Z', NaN],
-        values: [['2015-07-01T20:10:30.781Z', 1], ['2015-07-01T20:11:00.781Z', NaN]],
+        values: [
+          ['2015-07-01T20:10:30.781Z', 1],
+          ['2015-07-01T20:11:00.781Z', NaN],
+        ],
       },
     ]);
   });