From 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 17 Dec 2020 11:59:07 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee

---
 .../clusters/components/__snapshots__/applications_spec.js.snap       | 4 ++--
 .../components/__snapshots__/remove_cluster_confirmation_spec.js.snap | 2 ++
 spec/frontend/clusters/stores/clusters_store_spec.js                  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'spec/frontend/clusters')

diff --git a/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap b/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
index 744ef318260..c2ace1b4e30 100644
--- a/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
+++ b/spec/frontend/clusters/components/__snapshots__/applications_spec.js.snap
@@ -55,7 +55,7 @@ exports[`Applications Crossplane application shows the correct description 1`] =
 `;
 
 exports[`Applications Ingress application shows the correct warning message 1`] = `
-<strong
+<span
   data-testid="ingressCostWarning"
 >
   Installing Ingress may incur additional costs. Learn more about 
@@ -68,7 +68,7 @@ exports[`Applications Ingress application shows the correct warning message 1`]
     pricing
   </a>
   .
-</strong>
+</span>
 `;
 
 exports[`Applications Knative application shows the correct description 1`] = `
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 de40e03b598..6f28573c808 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
@@ -53,6 +53,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
           type="button"
         >
           <svg
+            aria-hidden="true"
             class="gl-icon s16 gl-new-dropdown-item-check-icon"
             data-testid="mobile-issue-close-icon"
           >
@@ -107,6 +108,7 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
           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"
           >
diff --git a/spec/frontend/clusters/stores/clusters_store_spec.js b/spec/frontend/clusters/stores/clusters_store_spec.js
index ed862818c7b..381a4717127 100644
--- a/spec/frontend/clusters/stores/clusters_store_spec.js
+++ b/spec/frontend/clusters/stores/clusters_store_spec.js
@@ -50,6 +50,7 @@ describe('Clusters Store', () => {
 
       expect(store.state).toEqual({
         helpPath: null,
+        helmHelpPath: null,
         ingressHelpPath: null,
         environmentsHelpPath: null,
         clustersHelpPath: null,
@@ -62,7 +63,7 @@ describe('Clusters Store', () => {
         rbac: false,
         applications: {
           helm: {
-            title: 'Helm Tiller',
+            title: 'Legacy Helm Tiller server',
             status: mockResponseData.applications[0].status,
             statusReason: mockResponseData.applications[0].status_reason,
             requestReason: null,
-- 
cgit v1.2.3