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

16 files changed, 31 insertions, 57 deletions

diff --git a/spec/frontend/jobs/components/artifacts_block_spec.js b/spec/frontend/jobs/components/artifacts_block_spec.js
index a709a59cadd..134463c6763 100644
--- a/spec/frontend/jobs/components/artifacts_block_spec.js
+++ b/spec/frontend/jobs/components/artifacts_block_spec.js
@@ -1,12 +1,12 @@
 import { mount } from '@vue/test-utils';
+import { trimText } from 'helpers/text_helper';
 import { getTimeago } from '~/lib/utils/datetime_utility';
 import ArtifactsBlock from '~/jobs/components/artifacts_block.vue';
-import { trimText } from '../../helpers/text_helper';
 
 describe('Artifacts block', () => {
   let wrapper;
 
-  const createWrapper = propsData =>
+  const createWrapper = (propsData) =>
     mount(ArtifactsBlock, {
       propsData: {
         helpUrl: 'help-url',
diff --git a/spec/frontend/jobs/components/commit_block_spec.js b/spec/frontend/jobs/components/commit_block_spec.js
index 4e2d0053831..13261317b48 100644
--- a/spec/frontend/jobs/components/commit_block_spec.js
+++ b/spec/frontend/jobs/components/commit_block_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import component from '~/jobs/components/commit_block.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
 
 describe('Commit block', () => {
   const Component = Vue.extend(component);
diff --git a/spec/frontend/jobs/components/empty_state_spec.js b/spec/frontend/jobs/components/empty_state_spec.js
index 29d0c4e07aa..c9de110ce06 100644
--- a/spec/frontend/jobs/components/empty_state_spec.js
+++ b/spec/frontend/jobs/components/empty_state_spec.js
@@ -12,7 +12,7 @@ describe('Empty State', () => {
     variablesSettingsUrl: '',
   };
 
-  const createWrapper = props => {
+  const createWrapper = (props) => {
     wrapper = mount(EmptyState, {
       propsData: {
         ...defaultProps,
@@ -46,11 +46,7 @@ describe('Empty State', () => {
     });
 
     it('renders provided title', () => {
-      expect(
-        findTitle()
-          .text()
-          .trim(),
-      ).toBe(defaultProps.title);
+      expect(findTitle().text().trim()).toBe(defaultProps.title);
     });
   });
 
@@ -60,11 +56,7 @@ describe('Empty State', () => {
     });
 
     it('renders content', () => {
-      expect(
-        findContent()
-          .text()
-          .trim(),
-      ).toBe(content);
+      expect(findContent().text().trim()).toBe(content);
     });
   });
 
diff --git a/spec/frontend/jobs/components/erased_block_spec.js b/spec/frontend/jobs/components/erased_block_spec.js
index d66ee71df6a..b3e1d28eb16 100644
--- a/spec/frontend/jobs/components/erased_block_spec.js
+++ b/spec/frontend/jobs/components/erased_block_spec.js
@@ -10,7 +10,7 @@ describe('Erased block', () => {
   const timeago = getTimeago();
   const formattedDate = timeago.format(erasedAt);
 
-  const createComponent = props => {
+  const createComponent = (props) => {
     wrapper = mount(ErasedBlock, {
       propsData: props,
     });
diff --git a/spec/frontend/jobs/components/job_app_spec.js b/spec/frontend/jobs/components/job_app_spec.js
index 94653d4d4c7..657687b5e2a 100644
--- a/spec/frontend/jobs/components/job_app_spec.js
+++ b/spec/frontend/jobs/components/job_app_spec.js
@@ -3,7 +3,7 @@ import { mount, createLocalVue } from '@vue/test-utils';
 import { GlLoadingIcon } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
 import { getJSONFixture } from 'helpers/fixtures';
-import { TEST_HOST } from 'jest/helpers/test_constants';
+import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import JobApp from '~/jobs/components/job_app.vue';
 import Sidebar from '~/jobs/components/sidebar.vue';
@@ -133,13 +133,9 @@ describe('Job App', () => {
         });
 
         it('should render provided job information', () => {
-          expect(
-            wrapper
-              .find('.header-main-content')
-              .text()
-              .replace(/\s+/g, ' ')
-              .trim(),
-          ).toContain('passed Job #4757 triggered 1 year ago by Root');
+          expect(wrapper.find('.header-main-content').text().replace(/\s+/g, ' ').trim()).toContain(
+            'passed Job #4757 triggered 1 year ago by Root',
+          );
         });
 
         it('should render new issue link', () => {
@@ -151,11 +147,7 @@ describe('Job App', () => {
         it('should render created key', () =>
           setupAndMount().then(() => {
             expect(
-              wrapper
-                .find('.header-main-content')
-                .text()
-                .replace(/\s+/g, ' ')
-                .trim(),
+              wrapper.find('.header-main-content').text().replace(/\s+/g, ' ').trim(),
             ).toContain('passed Job #4757 created 3 weeks ago by Root');
           }));
       });
@@ -383,7 +375,7 @@ describe('Job App', () => {
     });
 
     describe('sidebar', () => {
-      it('has no blank blocks', done => {
+      it('has no blank blocks', (done) => {
         setupAndMount({
           jobData: {
             duration: null,
@@ -400,7 +392,7 @@ describe('Job App', () => {
             const blocks = wrapper.findAll('.blocks-container > *').wrappers;
             expect(blocks.length).toBeGreaterThan(0);
 
-            blocks.forEach(block => {
+            blocks.forEach((block) => {
               expect(block.text().trim()).not.toBe('');
             });
           })
diff --git a/spec/frontend/jobs/components/job_container_item_spec.js b/spec/frontend/jobs/components/job_container_item_spec.js
index 41b399fa32b..af7ce100d83 100644
--- a/spec/frontend/jobs/components/job_container_item_spec.js
+++ b/spec/frontend/jobs/components/job_container_item_spec.js
@@ -82,7 +82,7 @@ describe('JobContainerItem', () => {
         );
     });
 
-    it('displays remaining time in tooltip', done => {
+    it('displays remaining time in tooltip', (done) => {
       vm = mountComponent(Component, {
         job: delayedJobFixture,
         isActive: false,
diff --git a/spec/frontend/jobs/components/job_log_controllers_spec.js b/spec/frontend/jobs/components/job_log_controllers_spec.js
index 233cef05622..97b0333cb32 100644
--- a/spec/frontend/jobs/components/job_log_controllers_spec.js
+++ b/spec/frontend/jobs/components/job_log_controllers_spec.js
@@ -21,7 +21,7 @@ describe('Job log controllers', () => {
     isTraceSizeVisible: true,
   };
 
-  const createWrapper = props => {
+  const createWrapper = (props) => {
     wrapper = mount(JobLogControllers, {
       propsData: {
         ...defaultProps,
diff --git a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
index be684769b46..bc0d455c309 100644
--- a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
+++ b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
@@ -1,8 +1,8 @@
 import { shallowMount } from '@vue/test-utils';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import SidebarJobDetailsContainer from '~/jobs/components/sidebar_job_details_container.vue';
 import DetailRow from '~/jobs/components/sidebar_detail_row.vue';
 import createStore from '~/jobs/store';
-import { extendedWrapper } from '../../helpers/vue_test_utils_helper';
 import job from '../mock_data';
 
 describe('Job Sidebar Details Container', () => {
@@ -37,7 +37,7 @@ describe('Job Sidebar Details Container', () => {
     it('should render an empty container', () => {
       createWrapper();
 
-      expect(wrapper.isEmpty()).toBe(true);
+      expect(wrapper.html()).toBe('');
     });
   });
 
@@ -55,7 +55,6 @@ describe('Job Sidebar Details Container', () => {
       await store.dispatch('receiveJobSuccess', { [detail]: job[detail] });
       const detailsRow = findAllDetailsRow();
 
-      expect(wrapper.isEmpty()).toBe(false);
       expect(detailsRow).toHaveLength(1);
       expect(detailsRow.at(0).text()).toBe(value);
     });
@@ -65,7 +64,6 @@ describe('Job Sidebar Details Container', () => {
       await store.dispatch('receiveJobSuccess', { tags });
       const tagsComponent = findJobTags();
 
-      expect(wrapper.isEmpty()).toBe(false);
       expect(tagsComponent.text()).toBe('Tags: tag');
     });
   });
@@ -91,7 +89,7 @@ describe('Job Sidebar Details Container', () => {
       await store.dispatch('receiveJobSuccess', { metadata });
       const detailsRow = findAllDetailsRow();
 
-      expect(wrapper.isEmpty()).toBe(true);
+      expect(wrapper.html()).toBe('');
       expect(detailsRow.exists()).toBe(false);
     });
 
@@ -100,7 +98,6 @@ describe('Job Sidebar Details Container', () => {
       await store.dispatch('receiveJobSuccess', { metadata });
       const detailsRow = findAllDetailsRow();
 
-      expect(wrapper.isEmpty()).toBe(false);
       expect(detailsRow).toHaveLength(1);
       expect(detailsRow.at(0).text()).toBe('Timeout: 1m 40s');
     });
diff --git a/spec/frontend/jobs/components/jobs_container_spec.js b/spec/frontend/jobs/components/jobs_container_spec.js
index 119b18b7557..9a336489101 100644
--- a/spec/frontend/jobs/components/jobs_container_spec.js
+++ b/spec/frontend/jobs/components/jobs_container_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import component from '~/jobs/components/jobs_container.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
 
 describe('Jobs List block', () => {
   const Component = Vue.extend(component);
diff --git a/spec/frontend/jobs/components/log/line_spec.js b/spec/frontend/jobs/components/log/line_spec.js
index 914ae2424c8..367154e7f82 100644
--- a/spec/frontend/jobs/components/log/line_spec.js
+++ b/spec/frontend/jobs/components/log/line_spec.js
@@ -34,10 +34,7 @@ describe('Job Log Line', () => {
   const findLine = () => wrapper.find('span');
   const findLink = () => findLine().find('a');
   const findLinks = () => findLine().findAll('a');
-  const findLinkAttributeByIndex = i =>
-    findLinks()
-      .at(i)
-      .attributes();
+  const findLinkAttributeByIndex = (i) => findLinks().at(i).attributes();
 
   beforeEach(() => {
     data = mockProps();
diff --git a/spec/frontend/jobs/components/log/log_spec.js b/spec/frontend/jobs/components/log/log_spec.js
index 015d5e01a46..f662ffa1780 100644
--- a/spec/frontend/jobs/components/log/log_spec.js
+++ b/spec/frontend/jobs/components/log/log_spec.js
@@ -62,11 +62,7 @@ describe('Job Log', () => {
     });
 
     it('renders an icon with the open state', () => {
-      expect(
-        findCollapsibleLine()
-          .find('[data-testid="angle-down-icon"]')
-          .exists(),
-      ).toBe(true);
+      expect(findCollapsibleLine().find('[data-testid="angle-down-icon"]').exists()).toBe(true);
     });
 
     describe('on click header section', () => {
diff --git a/spec/frontend/jobs/components/manual_variables_form_spec.js b/spec/frontend/jobs/components/manual_variables_form_spec.js
index 547f146cf88..f6c37407e2b 100644
--- a/spec/frontend/jobs/components/manual_variables_form_spec.js
+++ b/spec/frontend/jobs/components/manual_variables_form_spec.js
@@ -27,7 +27,7 @@ describe('Manual Variables Form', () => {
     factory(requiredProps);
   });
 
-  afterEach(done => {
+  afterEach((done) => {
     // The component has a `nextTick` callback after some events so we need
     // to wait for those to finish before destroying.
     setImmediate(() => {
@@ -54,7 +54,7 @@ describe('Manual Variables Form', () => {
   });
 
   describe('when adding a new variable', () => {
-    it('creates a new variable when user types a new key and resets the form', done => {
+    it('creates a new variable when user types a new key and resets the form', (done) => {
       wrapper.vm
         .$nextTick()
         .then(() => wrapper.find({ ref: 'inputKey' }).setValue('new key'))
@@ -67,7 +67,7 @@ describe('Manual Variables Form', () => {
         .catch(done.fail);
     });
 
-    it('creates a new variable when user types a new value and resets the form', done => {
+    it('creates a new variable when user types a new value and resets the form', (done) => {
       wrapper.vm
         .$nextTick()
         .then(() => wrapper.find({ ref: 'inputSecretValue' }).setValue('new value'))
@@ -82,7 +82,7 @@ describe('Manual Variables Form', () => {
   });
 
   describe('when deleting a variable', () => {
-    beforeEach(done => {
+    beforeEach((done) => {
       wrapper.vm.variables = [
         {
           key: 'new key',
diff --git a/spec/frontend/jobs/components/sidebar_spec.js b/spec/frontend/jobs/components/sidebar_spec.js
index 1d4be2fb81e..22d555ffec7 100644
--- a/spec/frontend/jobs/components/sidebar_spec.js
+++ b/spec/frontend/jobs/components/sidebar_spec.js
@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import Sidebar, { forwardDeploymentFailureModalId } from '~/jobs/components/sidebar.vue';
 import StagesDropdown from '~/jobs/components/stages_dropdown.vue';
 import JobsContainer from '~/jobs/components/jobs_container.vue';
@@ -6,7 +7,6 @@ import JobRetryForwardDeploymentModal from '~/jobs/components/job_retry_forward_
 import JobRetryButton from '~/jobs/components/job_sidebar_retry_button.vue';
 import createStore from '~/jobs/store';
 import job, { jobsInStage } from '../mock_data';
-import { extendedWrapper } from '../../helpers/vue_test_utils_helper';
 
 describe('Sidebar details block', () => {
   let store;
diff --git a/spec/frontend/jobs/components/stages_dropdown_spec.js b/spec/frontend/jobs/components/stages_dropdown_spec.js
index e8fa6094c25..72d5d0f9d44 100644
--- a/spec/frontend/jobs/components/stages_dropdown_spec.js
+++ b/spec/frontend/jobs/components/stages_dropdown_spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
 import { trimText } from 'helpers/text_helper';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import component from '~/jobs/components/stages_dropdown.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
 
 describe('Stages Dropdown', () => {
   const Component = Vue.extend(component);
diff --git a/spec/frontend/jobs/components/stuck_block_spec.js b/spec/frontend/jobs/components/stuck_block_spec.js
index 926286bf75a..4db73eaaaec 100644
--- a/spec/frontend/jobs/components/stuck_block_spec.js
+++ b/spec/frontend/jobs/components/stuck_block_spec.js
@@ -12,7 +12,7 @@ describe('Stuck Block Job component', () => {
     }
   });
 
-  const createWrapper = props => {
+  const createWrapper = (props) => {
     wrapper = shallowMount(StuckBlock, {
       propsData: {
         ...props,
diff --git a/spec/frontend/jobs/components/trigger_block_spec.js b/spec/frontend/jobs/components/trigger_block_spec.js
index 448197b82c0..16ea276ee4a 100644
--- a/spec/frontend/jobs/components/trigger_block_spec.js
+++ b/spec/frontend/jobs/components/trigger_block_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
 import component from '~/jobs/components/trigger_block.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
 
 describe('Trigger block', () => {
   const Component = Vue.extend(component);
@@ -32,7 +32,7 @@ describe('Trigger block', () => {
 
   describe('with variables', () => {
     describe('hide/reveal variables', () => {
-      it('should toggle variables on click', done => {
+      it('should toggle variables on click', (done) => {
         vm = mountComponent(Component, {
           trigger: {
             short_token: 'bd7e',