Fix functional tests

elastic · Jun 3, 2022 · 21a4c73 · 21a4c73
1 parent a46b3d6
commit 21a4c73
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 18 deletions.
diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js b/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js
@@ -70,7 +70,7 @@ export function HealthStatusIndicator(props) {
   return (
     <EuiFlexGroup alignItems="center" gutterSize="s">
       <EuiFlexItem grow={false}>
-        <EuiHealth color={statusColor} data-test-subj="statusIcon">
+        <EuiHealth color={statusColor} data-test-subj="status">
           <HealthLabel {...props} />
         </EuiHealth>
       </EuiFlexItem>

diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js
@@ -231,7 +231,7 @@ function statusIndicator(status, someStatusIsStale, instancesHref, staleStatusTh
     <>
       <div style={{ marginBottom: '8px' }}>
         <EuiToolTip position="top" content={staleMessage}>
-          <EuiBadge iconType="alert" color="warning">
+          <EuiBadge iconType="alert" color="warning" data-test-subj="status">
             {i18n.translate('xpack.monitoring.cluster.overview.kibanaPanel.staleStatusLabel', {
               defaultMessage: 'Stale',
             })}

diff --git a/x-pack/plugins/monitoring/public/components/kibana/cluster_status/index.js b/x-pack/plugins/monitoring/public/components/kibana/cluster_status/index.js
@@ -133,6 +133,7 @@ function OverviewPageStatusIndicator({ staleMessage }) {
 
   return (
     <EuiStat
+      data-test-subj="status"
       description={i18n.translate('xpack.monitoring.kibana.clusterStatus.overview.statusLabel', {
         defaultMessage: 'Status',
       })}
@@ -160,6 +161,7 @@ function InstancesPageStatusIndicator({ staleMessage }) {
 
   return (
     <EuiStat
+      data-test-subj="status"
       description={i18n.translate('xpack.monitoring.kibana.clusterStatus.instances.statusLabel', {
         defaultMessage: 'Status',
       })}

diff --git a/x-pack/plugins/monitoring/public/components/kibana/detail_status/index.js b/x-pack/plugins/monitoring/public/components/kibana/detail_status/index.js
@@ -77,6 +77,7 @@ export function DetailStatus({ stats }) {
 
     return (
       <EuiStat
+        data-test-subj="status"
         description={description}
         title={title}
         titleSize="xxxs"

diff --git a/x-pack/plugins/monitoring/public/components/kibana/instances/instances.tsx b/x-pack/plugins/monitoring/public/components/kibana/instances/instances.tsx
@@ -116,7 +116,7 @@ const getColumns = (
       field: 'status',
       render: (status: string) => {
         return (
-          <EuiHealth color={statusIconColor(status)} data-test-subj="statusIcon">
+          <EuiHealth color={statusIconColor(status)} data-test-subj="status">
             {capitalize(status)}
           </EuiHealth>
         );
@@ -140,7 +140,7 @@ const getColumns = (
           },
         });
         return (
-          <span>
+          <span data-test-subj="lastSeen">
             {lastSeenTimestamp}
             {kibana.statusIsStale && (
               <>

diff --git a/x-pack/plugins/monitoring/public/components/summary_status/summary_status.js b/x-pack/plugins/monitoring/public/components/summary_status/summary_status.js
@@ -61,12 +61,13 @@ export const DefaultStatusIndicator = ({ status, isOnline, IconComponent }) => {
 
   return (
     <EuiStat
+      data-test-subj="status"
       title={
-        <Fragment>
+        <>
           <IconComponent status={status} isOnline={isOnline} />
           &nbsp;
           {capitalize(status)}
-        </Fragment>
+        </>
       }
       titleSize="xxxs"
       textAlign="left"

diff --git a/x-pack/test/functional/apps/monitoring/cluster/overview.js b/x-pack/test/functional/apps/monitoring/cluster/overview.js
@@ -105,7 +105,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('shows kibana panel', async () => {
-        expect(await overview.getKbnStatus()).to.be('Healthy');
+        expect(await overview.getKbnStatus()).to.be('Stale');
         expect(await overview.getKbnRequests()).to.be('174');
         expect(await overview.getKbnMaxResponseTime()).to.be('2203 ms');
         expect(await overview.getKbnInstances()).to.be('Instances: 1');

diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance.js b/x-pack/test/functional/apps/monitoring/kibana/instance.js
@@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }) {
         osFreeMemory: 'OS Free Memory\n1.5 GB',
         version: 'Version\n7.0.0-alpha1',
         uptime: 'Uptime\n3 minutes',
-        health: 'Health: green',
+        health: 'Last Reported Status\n Green\nStale',
       });
     });
   });

diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js
@@ -47,7 +47,7 @@ export default function ({ getService, getPageObjects }) {
         osFreeMemory: 'OS Free Memory\n1.5 GB',
         version: 'Version\n7.0.0-alpha1',
         uptime: 'Uptime\n3 minutes',
-        health: 'Health: green',
+        health: 'Last Reported Status\n Green\nStale',
       });
     });
   });

diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances.js b/x-pack/test/functional/apps/monitoring/kibana/instances.js
@@ -40,7 +40,7 @@ export default function ({ getService, getPageObjects }) {
         requests: 'Requests\n174',
         connections: 'Connections\n174',
         maxResponseTime: 'Max. Response Time\n2203 ms',
-        health: 'Health: green',
+        health: 'Status\nStale',
       });
     });
   });

diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js
@@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }) {
         requests: 'Requests\n174',
         connections: 'Connections\n174',
         maxResponseTime: 'Max. Response Time\n2203 ms',
-        health: 'Health: green',
+        health: 'Status\nStale',
       });
     });
   });

diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview.js b/x-pack/test/functional/apps/monitoring/kibana/overview.js
@@ -40,7 +40,7 @@ export default function ({ getService, getPageObjects }) {
         requests: 'Requests\n174',
         connections: 'Connections\n174',
         maxResponseTime: 'Max. Response Time\n2203 ms',
-        health: 'Health: green',
+        health: 'Status\nStale\nView all instances',
       });
     });
   });

diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js b/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js
@@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }) {
         requests: 'Requests\n174',
         connections: 'Connections\n174',
         maxResponseTime: 'Max. Response Time\n2203 ms',
-        health: 'Health: green',
+        health: 'Status\nStale\nView all instances',
       });
     });
   });

diff --git a/x-pack/test/functional/services/monitoring/cluster_overview.js b/x-pack/test/functional/services/monitoring/cluster_overview.js
@@ -33,7 +33,7 @@ export function MonitoringClusterOverviewProvider({ getService }) {
   const SUBJ_ES_ML_JOBS = `${SUBJ_ES_PANEL} > esMlJobs`;
 
   const SUBJ_KBN_PANEL = `${SUBJ_CLUSTER_ITEM_CONTAINER_PREFIX}Kibana`;
-  const SUBJ_KBN_STATUS = `${SUBJ_KBN_PANEL} > statusIcon`;
+  const SUBJ_KBN_STATUS = `${SUBJ_KBN_PANEL} > status`;
   const SUBJ_KBN_REQUESTS = `${SUBJ_KBN_PANEL} > kbnRequests`;
   const SUBJ_KBN_MAX_RESPONSE_TIME = `${SUBJ_KBN_PANEL} > kbnMaxResponseTime`;
   const SUBJ_KBN_CONNECTIONS = `${SUBJ_KBN_PANEL} > kbnConnections`;

diff --git a/x-pack/test/functional/services/monitoring/kibana_instance.js b/x-pack/test/functional/services/monitoring/kibana_instance.js
@@ -16,7 +16,7 @@ export function MonitoringKibanaInstanceProvider({ getService }) {
   const SUBJ_SUMMARY_OS_FREE_MEMORY = `${SUBJ_SUMMARY} > osFreeMemory`;
   const SUBJ_SUMMARY_VERSION = `${SUBJ_SUMMARY} > version`;
   const SUBJ_SUMMARY_UPTIME = `${SUBJ_SUMMARY} > uptime`;
-  const SUBJ_SUMMARY_HEALTH = `${SUBJ_SUMMARY} > statusIcon`;
+  const SUBJ_SUMMARY_HEALTH = `${SUBJ_SUMMARY} > status`;
 
   return new (class KibanaInstance {
     async isOnInstance() {
@@ -30,7 +30,7 @@ export function MonitoringKibanaInstanceProvider({ getService }) {
         osFreeMemory: await testSubjects.getVisibleText(SUBJ_SUMMARY_OS_FREE_MEMORY),
         version: await testSubjects.getVisibleText(SUBJ_SUMMARY_VERSION),
         uptime: await testSubjects.getVisibleText(SUBJ_SUMMARY_UPTIME),
-        health: await testSubjects.getAttribute(SUBJ_SUMMARY_HEALTH, 'alt'),
+        health: await testSubjects.getVisibleText(SUBJ_SUMMARY_HEALTH),
       };
     }
   })();

diff --git a/x-pack/test/functional/services/monitoring/kibana_summary_status.js b/x-pack/test/functional/services/monitoring/kibana_summary_status.js
@@ -14,7 +14,7 @@ export function MonitoringKibanaSummaryStatusProvider({ getService }) {
   const SUBJ_SUMMARY_REQUESTS = `${SUBJ_SUMMARY} > requests`;
   const SUBJ_SUMMARY_CONNECTIONS = `${SUBJ_SUMMARY} > connections`;
   const SUBJ_SUMMARY_MAX_RESPONSE_TIME = `${SUBJ_SUMMARY} > maxResponseTime`;
-  const SUBJ_SUMMARY_HEALTH = `${SUBJ_SUMMARY} > statusIcon`;
+  const SUBJ_SUMMARY_HEALTH = `${SUBJ_SUMMARY} > status`;
 
   return new (class KibanaSummaryStatus {
     async getContent() {
@@ -24,7 +24,7 @@ export function MonitoringKibanaSummaryStatusProvider({ getService }) {
         requests: await testSubjects.getVisibleText(SUBJ_SUMMARY_REQUESTS),
         connections: await testSubjects.getVisibleText(SUBJ_SUMMARY_CONNECTIONS),
         maxResponseTime: await testSubjects.getVisibleText(SUBJ_SUMMARY_MAX_RESPONSE_TIME),
-        health: await testSubjects.getAttribute(SUBJ_SUMMARY_HEALTH, 'alt'),
+        health: await testSubjects.getVisibleText(SUBJ_SUMMARY_HEALTH),
       };
     }
   })();