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

8 files changed, 134 insertions, 121 deletions

diff --git a/spec/frontend/clusters/clusters_bundle_spec.js b/spec/frontend/clusters/clusters_bundle_spec.js
index d3277cdb7cc..cd0eda2ab49 100644
--- a/spec/frontend/clusters/clusters_bundle_spec.js
+++ b/spec/frontend/clusters/clusters_bundle_spec.js
@@ -279,7 +279,7 @@ describe('Clusters', () => {
   });
 
   describe('uninstallApplication', () => {
-    it.each(APPLICATIONS)('tries to uninstall %s', applicationId => {
+    it.each(APPLICATIONS)('tries to uninstall %s', (applicationId) => {
       jest.spyOn(cluster.service, 'uninstallApplication').mockResolvedValueOnce();
 
       cluster.store.state.applications[applicationId].status = INSTALLED;
diff --git a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap
index 6f28573c808..ee4ec4636ea 100644
--- a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap
+++ b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap
@@ -41,109 +41,119 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
       role="menu"
       tabindex="-1"
     >
-      <!---->
-       
-      <li
-        class="gl-new-dropdown-item"
-        role="presentation"
+      <div
+        class="gl-new-dropdown-inner"
       >
-        <button
-          class="dropdown-item"
-          role="menuitem"
-          type="button"
+        <!---->
+         
+        <div
+          class="gl-new-dropdown-contents"
         >
-          <svg
-            aria-hidden="true"
-            class="gl-icon s16 gl-new-dropdown-item-check-icon"
-            data-testid="mobile-issue-close-icon"
-          >
-            <use
-              href="#mobile-issue-close"
-            />
-          </svg>
-           
-          <!---->
-           
-          <!---->
-           
-          <div
-            class="gl-new-dropdown-item-text-wrapper"
+          <li
+            class="gl-new-dropdown-item"
+            role="presentation"
           >
-            <p
-              class="gl-new-dropdown-item-text-primary"
+            <button
+              class="dropdown-item"
+              role="menuitem"
+              type="button"
             >
-              <strong>
-                Remove integration and resources
-              </strong>
+              <svg
+                aria-hidden="true"
+                class="gl-icon s16 gl-new-dropdown-item-check-icon"
+                data-testid="mobile-issue-close-icon"
+              >
+                <use
+                  href="#mobile-issue-close"
+                />
+              </svg>
+               
+              <!---->
+               
+              <!---->
                
-              <div>
-                Deletes all GitLab resources attached to this cluster during removal
+              <div
+                class="gl-new-dropdown-item-text-wrapper"
+              >
+                <p
+                  class="gl-new-dropdown-item-text-primary"
+                >
+                  <strong>
+                    Remove integration and resources
+                  </strong>
+                   
+                  <div>
+                    Deletes all GitLab resources attached to this cluster during removal
+                  </div>
+                </p>
+                 
+                <!---->
               </div>
-            </p>
-             
-            <!---->
-          </div>
+               
+              <!---->
+            </button>
+          </li>
            
-          <!---->
-        </button>
-      </li>
-       
-      <li
-        class="gl-new-dropdown-divider"
-        role="presentation"
-      >
-        <hr
-          aria-orientation="horizontal"
-          class="dropdown-divider"
-          role="separator"
-        />
-      </li>
-      <li
-        class="gl-new-dropdown-item"
-        role="presentation"
-      >
-        <button
-          class="dropdown-item"
-          role="menuitem"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="gl-icon s16 gl-new-dropdown-item-check-icon gl-visibility-hidden"
-            data-testid="mobile-issue-close-icon"
+          <li
+            class="gl-new-dropdown-divider"
+            role="presentation"
           >
-            <use
-              href="#mobile-issue-close"
+            <hr
+              aria-orientation="horizontal"
+              class="dropdown-divider"
+              role="separator"
             />
-          </svg>
-           
-          <!---->
-           
-          <!---->
-           
-          <div
-            class="gl-new-dropdown-item-text-wrapper"
+          </li>
+          <li
+            class="gl-new-dropdown-item"
+            role="presentation"
           >
-            <p
-              class="gl-new-dropdown-item-text-primary"
+            <button
+              class="dropdown-item"
+              role="menuitem"
+              type="button"
             >
-              <strong>
-                Remove integration
-              </strong>
+              <svg
+                aria-hidden="true"
+                class="gl-icon s16 gl-new-dropdown-item-check-icon gl-visibility-hidden"
+                data-testid="mobile-issue-close-icon"
+              >
+                <use
+                  href="#mobile-issue-close"
+                />
+              </svg>
+               
+              <!---->
+               
+              <!---->
                
-              <div>
-                Removes cluster from project but keeps associated resources
+              <div
+                class="gl-new-dropdown-item-text-wrapper"
+              >
+                <p
+                  class="gl-new-dropdown-item-text-primary"
+                >
+                  <strong>
+                    Remove integration
+                  </strong>
+                   
+                  <div>
+                    Removes cluster from project but keeps associated resources
+                  </div>
+                </p>
+                 
+                <!---->
               </div>
-            </p>
-             
-            <!---->
-          </div>
+               
+              <!---->
+            </button>
+          </li>
            
           <!---->
-        </button>
-      </li>
-       
-      <!---->
+        </div>
+         
+        <!---->
+      </div>
        
     </ul>
   </div>
diff --git a/spec/frontend/clusters/components/application_row_spec.js b/spec/frontend/clusters/components/application_row_spec.js
index 0a964426c95..49a299cfb3c 100644
--- a/spec/frontend/clusters/components/application_row_spec.js
+++ b/spec/frontend/clusters/components/application_row_spec.js
@@ -15,7 +15,7 @@ describe('Application Row', () => {
     wrapper.destroy();
   });
 
-  const mountComponent = data => {
+  const mountComponent = (data) => {
     wrapper = shallowMount(ApplicationRow, {
       stubs: { GlSprintf },
       propsData: {
diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js
index 5438f3053a8..cf89246c1a5 100644
--- a/spec/frontend/clusters/components/applications_spec.js
+++ b/spec/frontend/clusters/components/applications_spec.js
@@ -16,7 +16,7 @@ describe('Applications', () => {
     gon.features = gon.features || {};
   });
 
-  const createApp = ({ applications, type, props } = {}, isShallow) => {
+  const createApp = ({ applications, type, propsData } = {}, isShallow) => {
     const mountMethod = isShallow ? shallowMount : mount;
 
     wrapper = mountMethod(Applications, {
@@ -24,13 +24,13 @@ describe('Applications', () => {
       propsData: {
         type,
         applications: { ...APPLICATIONS_MOCK_STATE, ...applications },
-        ...props,
+        ...propsData,
       },
     });
   };
 
-  const createShallowApp = options => createApp(options, true);
-  const findByTestId = id => wrapper.find(`[data-testid="${id}"]`);
+  const createShallowApp = (options) => createApp(options, true);
+  const findByTestId = (id) => wrapper.find(`[data-testid="${id}"]`);
   afterEach(() => {
     wrapper.destroy();
   });
@@ -544,7 +544,7 @@ describe('Applications', () => {
 
   describe('Cilium application', () => {
     it('shows the correct description', () => {
-      createApp({ props: { ciliumHelpPath: 'cilium-help-path' } });
+      createApp({ propsData: { ciliumHelpPath: 'cilium-help-path' } });
       expect(findByTestId('ciliumDescription').element).toMatchSnapshot();
     });
   });
diff --git a/spec/frontend/clusters/components/fluentd_output_settings_spec.js b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
index 25db8785edc..cd996ae915b 100644
--- a/spec/frontend/clusters/components/fluentd_output_settings_spec.js
+++ b/spec/frontend/clusters/components/fluentd_output_settings_spec.js
@@ -37,11 +37,11 @@ describe('FluentdOutputSettings', () => {
   const findSaveButton = () => wrapper.find({ ref: 'saveBtn' });
   const findCancelButton = () => wrapper.find({ ref: 'cancelBtn' });
   const findProtocolDropdown = () => wrapper.find(GlDropdown);
-  const findCheckbox = name =>
-    wrapper.findAll(GlFormCheckbox).wrappers.find(x => x.text() === name);
+  const findCheckbox = (name) =>
+    wrapper.findAll(GlFormCheckbox).wrappers.find((x) => x.text() === name);
   const findHost = () => wrapper.find('#fluentd-host');
   const findPort = () => wrapper.find('#fluentd-port');
-  const changeCheckbox = checkbox => {
+  const changeCheckbox = (checkbox) => {
     const currentValue = checkbox.attributes('checked')?.toString() === 'true';
     checkbox.vm.$emit('input', !currentValue);
   };
@@ -49,9 +49,9 @@ describe('FluentdOutputSettings', () => {
     element.value = val;
     element.dispatchEvent(new Event('input'));
   };
-  const changePort = val => changeInput(findPort(), val);
-  const changeHost = val => changeInput(findHost(), val);
-  const changeProtocol = idx => findProtocolDropdown().vm.$children[idx].$emit('click');
+  const changePort = (val) => changeInput(findPort(), val);
+  const changeHost = (val) => changeInput(findHost(), val);
+  const changeProtocol = (idx) => findProtocolDropdown().vm.$children[idx].$emit('click');
   const toApplicationSettings = ({ wafLogEnabled, ciliumLogEnabled, ...settings }) => ({
     ...settings,
     waf_log_enabled: wafLogEnabled,
diff --git a/spec/frontend/clusters/components/uninstall_application_button_spec.js b/spec/frontend/clusters/components/uninstall_application_button_spec.js
index 387e2188572..c106292965e 100644
--- a/spec/frontend/clusters/components/uninstall_application_button_spec.js
+++ b/spec/frontend/clusters/components/uninstall_application_button_spec.js
@@ -24,7 +24,7 @@ describe('UninstallApplicationButton', () => {
     ${UPDATING}     | ${false} | ${true}  | ${'Uninstall'}
     ${UNINSTALLING} | ${true}  | ${true}  | ${'Uninstalling'}
   `('when app status is $status', ({ loading, disabled, status, text }) => {
-    beforeAll(() => {
+    beforeEach(() => {
       createComponent({ status });
     });
 
diff --git a/spec/frontend/clusters/services/application_state_machine_spec.js b/spec/frontend/clusters/services/application_state_machine_spec.js
index 7eee54949fa..a3850a64f3b 100644
--- a/spec/frontend/clusters/services/application_state_machine_spec.js
+++ b/spec/frontend/clusters/services/application_state_machine_spec.js
@@ -25,7 +25,7 @@ const {
 const NO_EFFECTS = 'no effects';
 
 describe('applicationStateMachine', () => {
-  const noEffectsToEmptyObject = effects => (typeof effects === 'string' ? {} : effects);
+  const noEffectsToEmptyObject = (effects) => (typeof effects === 'string' ? {} : effects);
 
   describe(`current state is ${NO_STATUS}`, () => {
     it.each`
@@ -42,7 +42,7 @@ describe('applicationStateMachine', () => {
       ${UNINSTALLING}    | ${UNINSTALLING}      | ${NO_EFFECTS}
       ${INSTALLED}       | ${UNINSTALL_ERRORED} | ${{ uninstallFailed: true }}
       ${UNINSTALLED}     | ${UNINSTALLED}       | ${NO_EFFECTS}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: NO_STATUS,
@@ -59,7 +59,7 @@ describe('applicationStateMachine', () => {
     it.each`
       expectedState  | event          | effects
       ${INSTALLABLE} | ${INSTALLABLE} | ${NO_EFFECTS}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: NOT_INSTALLABLE,
@@ -79,7 +79,7 @@ describe('applicationStateMachine', () => {
       ${INSTALLED}       | ${INSTALLED}       | ${{ installFailed: false }}
       ${NOT_INSTALLABLE} | ${NOT_INSTALLABLE} | ${NO_EFFECTS}
       ${UNINSTALLED}     | ${UNINSTALLED}     | ${{ installFailed: false }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: INSTALLABLE,
@@ -97,7 +97,7 @@ describe('applicationStateMachine', () => {
       expectedState  | event        | effects
       ${INSTALLED}   | ${INSTALLED} | ${NO_EFFECTS}
       ${INSTALLABLE} | ${ERROR}     | ${{ installFailed: true }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: INSTALLING,
@@ -118,7 +118,7 @@ describe('applicationStateMachine', () => {
       ${NOT_INSTALLABLE} | ${NOT_INSTALLABLE} | ${NO_EFFECTS}
       ${UNINSTALLED}     | ${UNINSTALLED}     | ${NO_EFFECTS}
       ${INSTALLABLE}     | ${ERROR}           | ${{ installFailed: true }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: INSTALLED,
@@ -136,7 +136,7 @@ describe('applicationStateMachine', () => {
       expectedState | event             | effects
       ${INSTALLED}  | ${UPDATED}        | ${{ updateSuccessful: true }}
       ${INSTALLED}  | ${UPDATE_ERRORED} | ${{ updateFailed: true }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: UPDATING,
@@ -154,7 +154,7 @@ describe('applicationStateMachine', () => {
       expectedState  | event                | effects
       ${INSTALLABLE} | ${INSTALLABLE}       | ${{ uninstallSuccessful: true }}
       ${INSTALLED}   | ${UNINSTALL_ERRORED} | ${{ uninstallFailed: true }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: UNINSTALLING,
@@ -172,7 +172,7 @@ describe('applicationStateMachine', () => {
       expectedState  | event        | effects
       ${INSTALLED}   | ${INSTALLED} | ${NO_EFFECTS}
       ${INSTALLABLE} | ${ERROR}     | ${{ installFailed: true }}
-    `(`transitions to $expectedState on $event event and applies $effects`, data => {
+    `(`transitions to $expectedState on $event event and applies $effects`, (data) => {
       const { expectedState, event, effects } = data;
       const currentAppState = {
         status: UNINSTALLED,
diff --git a/spec/frontend/clusters/stores/clusters_store_spec.js b/spec/frontend/clusters/stores/clusters_store_spec.js
index 381a4717127..df10d9af273 100644
--- a/spec/frontend/clusters/stores/clusters_store_spec.js
+++ b/spec/frontend/clusters/stores/clusters_store_spec.js
@@ -237,19 +237,22 @@ describe('Clusters Store', () => {
       });
     });
 
-    describe.each(APPLICATION_INSTALLED_STATUSES)('given the current app status is %s', status => {
-      it('marks application as installed', () => {
-        const mockResponseData =
-          CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/2/status.json'].data;
-        const runnerAppIndex = 2;
+    describe.each(APPLICATION_INSTALLED_STATUSES)(
+      'given the current app status is %s',
+      (status) => {
+        it('marks application as installed', () => {
+          const mockResponseData =
+            CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/2/status.json'].data;
+          const runnerAppIndex = 2;
 
-        mockResponseData.applications[runnerAppIndex].status = status;
+          mockResponseData.applications[runnerAppIndex].status = status;
 
-        store.updateStateFromServer(mockResponseData);
+          store.updateStateFromServer(mockResponseData);
 
-        expect(store.state.applications[RUNNER].installed).toBe(true);
-      });
-    });
+          expect(store.state.applications[RUNNER].installed).toBe(true);
+        });
+      },
+    );
 
     it('sets default hostname for jupyter when ingress has a ip address', () => {
       const mockResponseData =