Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

4 files changed, 54 insertions, 11 deletions

diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js
index 628c35ae839..d61f79071d5 100644
--- a/spec/frontend/clusters_list/components/clusters_spec.js
+++ b/spec/frontend/clusters_list/components/clusters_spec.js
@@ -6,7 +6,7 @@ import {
   GlDeprecatedSkeletonLoading as GlSkeletonLoading,
   GlTable,
 } from '@gitlab/ui';
-import * as Sentry from '@sentry/browser';
+import * as Sentry from '~/sentry/wrapper';
 import axios from '~/lib/utils/axios_utils';
 import Clusters from '~/clusters_list/components/clusters.vue';
 import ClusterStore from '~/clusters_list/store';
@@ -164,18 +164,18 @@ describe('Clusters', () => {
       });
 
       it.each`
-        nodeSize     | lineNumber
-        ${'Unknown'} | ${0}
-        ${'1'}       | ${1}
-        ${'2'}       | ${2}
-        ${'1'}       | ${3}
-        ${'1'}       | ${4}
-        ${'Unknown'} | ${5}
-      `('renders node size for each cluster', ({ nodeSize, lineNumber }) => {
+        nodeText                    | lineNumber
+        ${'Unable to Authenticate'} | ${0}
+        ${'1'}                      | ${1}
+        ${'2'}                      | ${2}
+        ${'1'}                      | ${3}
+        ${'1'}                      | ${4}
+        ${'Unknown Error'}          | ${5}
+      `('renders node size for each cluster', ({ nodeText, lineNumber }) => {
         const sizes = findTable().findAll('td:nth-child(3)');
         const size = sizes.at(lineNumber);
 
-        expect(size.text()).toBe(nodeSize);
+        expect(size.text()).toContain(nodeText);
         expect(size.find(GlSkeletonLoading).exists()).toBe(false);
       });
     });
diff --git a/spec/frontend/clusters_list/components/node_error_help_text_spec.js b/spec/frontend/clusters_list/components/node_error_help_text_spec.js
new file mode 100644
index 00000000000..4d157b3a8ab
--- /dev/null
+++ b/spec/frontend/clusters_list/components/node_error_help_text_spec.js
@@ -0,0 +1,33 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlPopover } from '@gitlab/ui';
+import NodeErrorHelpText from '~/clusters_list/components/node_error_help_text.vue';
+
+describe('NodeErrorHelpText', () => {
+  let wrapper;
+
+  const createWrapper = propsData => {
+    wrapper = shallowMount(NodeErrorHelpText, { propsData, stubs: { GlPopover } });
+    return wrapper.vm.$nextTick();
+  };
+
+  const findPopover = () => wrapper.find(GlPopover);
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it.each`
+    errorType                 | wrapperText                 | popoverText
+    ${'authentication_error'} | ${'Unable to Authenticate'} | ${'GitLab failed to authenticate'}
+    ${'connection_error'}     | ${'Unable to Connect'}      | ${'GitLab failed to connect to the cluster'}
+    ${'http_error'}           | ${'Unable to Connect'}      | ${'There was an HTTP error when connecting to your cluster'}
+    ${'default'}              | ${'Unknown Error'}          | ${'An unknown error occurred while attempting to connect to Kubernetes.'}
+    ${'unknown_error_type'}   | ${'Unknown Error'}          | ${'An unknown error occurred while attempting to connect to Kubernetes.'}
+    ${null}                   | ${'Unknown Error'}          | ${'An unknown error occurred while attempting to connect to Kubernetes.'}
+  `('displays error text', ({ errorType, wrapperText, popoverText }) => {
+    return createWrapper({ errorType, popoverId: 'id' }).then(() => {
+      expect(wrapper.text()).toContain(wrapperText);
+      expect(findPopover().text()).toContain(popoverText);
+    });
+  });
+});
diff --git a/spec/frontend/clusters_list/mock_data.js b/spec/frontend/clusters_list/mock_data.js
index 48af3b91c94..ed32655d10e 100644
--- a/spec/frontend/clusters_list/mock_data.js
+++ b/spec/frontend/clusters_list/mock_data.js
@@ -6,6 +6,11 @@ export const clusterList = [
     provider_type: 'gcp',
     status: 'creating',
     nodes: null,
+    kubernetes_errors: {
+      connection_error: 'authentication_error',
+      node_connection_error: 'connection_error',
+      metrics_connection_error: 'http_error',
+    },
   },
   {
     name: 'My Cluster 2',
@@ -19,6 +24,7 @@ export const clusterList = [
         usage: { cpu: '246155922n', memory: '1255212Ki' },
       },
     ],
+    kubernetes_errors: {},
   },
   {
     name: 'My Cluster 3',
@@ -36,6 +42,7 @@ export const clusterList = [
         usage: { cpu: '307051934n', memory: '1379136Ki' },
       },
     ],
+    kubernetes_errors: {},
   },
   {
     name: 'My Cluster 4',
@@ -48,6 +55,7 @@ export const clusterList = [
         usage: { cpu: '1missingCpuUnit', memory: '1missingMemoryUnit' },
       },
     ],
+    kubernetes_errors: {},
   },
   {
     name: 'My Cluster 5',
@@ -59,12 +67,14 @@ export const clusterList = [
         status: { allocatable: { cpu: '1missingCpuUnit', memory: '1missingMemoryUnit' } },
       },
     ],
+    kubernetes_errors: {},
   },
   {
     name: 'My Cluster 6',
     environment_scope: '*',
     cluster_type: 'project_type',
     status: 'cleanup_ongoing',
+    kubernetes_errors: {},
   },
 ];
 
diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js
index 053128a179a..3d4e07d00eb 100644
--- a/spec/frontend/clusters_list/store/actions_spec.js
+++ b/spec/frontend/clusters_list/store/actions_spec.js
@@ -1,7 +1,7 @@
 import MockAdapter from 'axios-mock-adapter';
 import testAction from 'helpers/vuex_action_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import * as Sentry from '@sentry/browser';
+import * as Sentry from '~/sentry/wrapper';
 import Poll from '~/lib/utils/poll';
 import { deprecatedCreateFlash as flashError } from '~/flash';
 import axios from '~/lib/utils/axios_utils';