Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

9 files changed, 20 insertions, 17 deletions

diff --git a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
index 6b3d65ff037..4b827301943 100644
--- a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
+++ b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`EmptyStateComponent should render content 1`] = `
 "<section class=\\"row empty-state text-center\\">
   <div class=\\"col-12\\">
-    <div class=\\"svg-250 svg-content\\"><img src=\\"/image.svg\\" alt=\\"Getting started with serverless\\" class=\\"gl-max-w-full\\"></div>
+    <div class=\\"svg-250 svg-content\\"><img src=\\"/image.svg\\" alt=\\"\\" class=\\"gl-max-w-full\\"></div>
   </div>
   <div class=\\"col-12\\">
     <div class=\\"text-content gl-mx-auto gl-my-0 gl-p-5\\">
diff --git a/spec/frontend/serverless/components/area_spec.js b/spec/frontend/serverless/components/area_spec.js
index 8b6f664ae25..05c9ee44307 100644
--- a/spec/frontend/serverless/components/area_spec.js
+++ b/spec/frontend/serverless/components/area_spec.js
@@ -34,7 +34,7 @@ describe('Area component', () => {
   describe('methods', () => {
     describe('formatTooltipText', () => {
       const mockDate = mockNormalizedMetrics.queries[0].result[0].values[0].time;
-      const generateSeriesData = type => ({
+      const generateSeriesData = (type) => ({
         seriesData: [
           {
             componentSubType: type,
@@ -91,7 +91,7 @@ describe('Area component', () => {
 
         expect(
           data.filter(
-            datum => new Date(datum.time).getTime() > 0 && typeof datum.value === 'number',
+            (datum) => new Date(datum.time).getTime() > 0 && typeof datum.value === 'number',
           ).length,
         ).toBe(data.length);
       });
diff --git a/spec/frontend/serverless/components/function_row_spec.js b/spec/frontend/serverless/components/function_row_spec.js
index 76a9e149302..081edd33b3b 100644
--- a/spec/frontend/serverless/components/function_row_spec.js
+++ b/spec/frontend/serverless/components/function_row_spec.js
@@ -7,7 +7,7 @@ import { mockServerlessFunction } from '../mock_data';
 describe('functionRowComponent', () => {
   let wrapper;
 
-  const createComponent = func => {
+  const createComponent = (func) => {
     wrapper = shallowMount(functionRowComponent, {
       propsData: { func },
     });
diff --git a/spec/frontend/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js
index 0bd2e96a068..ffdb1f13111 100644
--- a/spec/frontend/serverless/components/missing_prometheus_spec.js
+++ b/spec/frontend/serverless/components/missing_prometheus_spec.js
@@ -6,7 +6,7 @@ import missingPrometheusComponent from '~/serverless/components/missing_promethe
 describe('missingPrometheusComponent', () => {
   let wrapper;
 
-  const createComponent = missingData => {
+  const createComponent = (missingData) => {
     const store = createStore({ clustersPath: '/clusters', helpPath: '/help' });
 
     wrapper = shallowMount(missingPrometheusComponent, { store, propsData: { missingData } });
diff --git a/spec/frontend/serverless/components/pod_box_spec.js b/spec/frontend/serverless/components/pod_box_spec.js
index 495d11bd9ec..cf0c14a2cac 100644
--- a/spec/frontend/serverless/components/pod_box_spec.js
+++ b/spec/frontend/serverless/components/pod_box_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import podBoxComponent from '~/serverless/components/pod_box.vue';
 
-const createComponent = count =>
+const createComponent = (count) =>
   shallowMount(podBoxComponent, {
     propsData: {
       count,
diff --git a/spec/frontend/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js
index 92e4938c2cd..c43933e5b94 100644
--- a/spec/frontend/serverless/components/url_spec.js
+++ b/spec/frontend/serverless/components/url_spec.js
@@ -3,7 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import urlComponent from '~/serverless/components/url.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 
-const createComponent = uri =>
+const createComponent = (uri) =>
   shallowMount(Vue.extend(urlComponent), {
     propsData: {
       uri,
diff --git a/spec/frontend/serverless/mock_data.js b/spec/frontend/serverless/mock_data.js
index ef616ceb37f..1816ad62a04 100644
--- a/spec/frontend/serverless/mock_data.js
+++ b/spec/frontend/serverless/mock_data.js
@@ -102,7 +102,10 @@ export const mockMetrics = {
         result: [
           {
             metric: {},
-            values: [[1551352298.756, '0'], [1551352358.756, '0']],
+            values: [
+              [1551352298.756, '0'],
+              [1551352358.756, '0'],
+            ],
           },
         ],
       },
diff --git a/spec/frontend/serverless/store/actions_spec.js b/spec/frontend/serverless/store/actions_spec.js
index aac57c75a4f..32e30a57d4b 100644
--- a/spec/frontend/serverless/store/actions_spec.js
+++ b/spec/frontend/serverless/store/actions_spec.js
@@ -1,14 +1,14 @@
 import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
 import statusCodes from '~/lib/utils/http_status';
 import { fetchFunctions, fetchMetrics } from '~/serverless/store/actions';
 import { mockServerlessFunctions, mockMetrics } from '../mock_data';
 import axios from '~/lib/utils/axios_utils';
-import testAction from '../../helpers/vuex_action_helper';
 import { adjustMetricQuery } from '../utils';
 
 describe('ServerlessActions', () => {
   describe('fetchFunctions', () => {
-    it('should successfully fetch functions', done => {
+    it('should successfully fetch functions', (done) => {
       const endpoint = '/functions';
       const mock = new MockAdapter(axios);
       mock.onGet(endpoint).reply(statusCodes.OK, JSON.stringify(mockServerlessFunctions));
@@ -29,12 +29,12 @@ describe('ServerlessActions', () => {
       );
     });
 
-    it('should successfully retry', done => {
+    it('should successfully retry', (done) => {
       const endpoint = '/functions';
       const mock = new MockAdapter(axios);
       mock
         .onGet(endpoint)
-        .reply(() => new Promise(resolve => setTimeout(() => resolve(200), Infinity)));
+        .reply(() => new Promise((resolve) => setTimeout(() => resolve(200), Infinity)));
 
       testAction(
         fetchFunctions,
@@ -51,7 +51,7 @@ describe('ServerlessActions', () => {
   });
 
   describe('fetchMetrics', () => {
-    it('should return no prometheus', done => {
+    it('should return no prometheus', (done) => {
       const endpoint = '/metrics';
       const mock = new MockAdapter(axios);
       mock.onGet(endpoint).reply(statusCodes.NO_CONTENT);
@@ -69,7 +69,7 @@ describe('ServerlessActions', () => {
       );
     });
 
-    it('should successfully fetch metrics', done => {
+    it('should successfully fetch metrics', (done) => {
       const endpoint = '/metrics';
       const mock = new MockAdapter(axios);
       mock.onGet(endpoint).reply(statusCodes.OK, JSON.stringify(mockMetrics));
diff --git a/spec/frontend/serverless/utils.js b/spec/frontend/serverless/utils.js
index 4af3eda1ffb..7caf7da231e 100644
--- a/spec/frontend/serverless/utils.js
+++ b/spec/frontend/serverless/utils.js
@@ -1,9 +1,9 @@
-export const adjustMetricQuery = data => {
+export const adjustMetricQuery = (data) => {
   const updatedMetric = data.metrics;
 
-  const queries = data.metrics.queries.map(query => ({
+  const queries = data.metrics.queries.map((query) => ({
     ...query,
-    result: query.result.map(result => ({
+    result: query.result.map((result) => ({
       ...result,
       values: result.values.map(([timestamp, value]) => ({
         time: new Date(timestamp * 1000).toISOString(),