From c278aaaf2b0bf801ec91e4478a50ab9384aa07a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ester=20Mart=C3=AD=20Vilaseca?=
 <ester.martivilaseca@elastic.co>
Date: Thu, 14 Oct 2021 15:57:27 +0200
Subject: [PATCH] [Stack monitoring] Fix clusters functional tests when react
 is enabled (#114982)

* Fix test subjects for overview page

* fix pathname matching
---
 .../public/application/pages/cluster/overview_page.tsx         | 2 +-
 x-pack/plugins/monitoring/public/application/route_init.tsx    | 2 +-
 x-pack/plugins/monitoring/public/directives/main/index.html    | 2 +-
 x-pack/test/functional/services/monitoring/cluster_overview.js | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
index b78df27cd12c4..04074762c8d22 100644
--- a/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
+++ b/x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
@@ -50,7 +50,7 @@ export const ClusterOverview: React.FC<{}> = () => {
       {
         id: 'clusterName',
         label: clusters[0].cluster_name,
-        testSubj: 'clusterName',
+        testSubj: 'overviewTabsclusterName',
         route: '/overview',
       },
     ];
diff --git a/x-pack/plugins/monitoring/public/application/route_init.tsx b/x-pack/plugins/monitoring/public/application/route_init.tsx
index c620229eb059a..52780aa280707 100644
--- a/x-pack/plugins/monitoring/public/application/route_init.tsx
+++ b/x-pack/plugins/monitoring/public/application/route_init.tsx
@@ -57,7 +57,7 @@ export const RouteInit: React.FC<RouteInitProps> = ({
 
     // check if we need to redirect because of attempt at unsupported multi-cluster monitoring
     const clusterSupported = cluster.isSupported || clusters.length === 1;
-    if (location.pathname !== 'home' && !clusterSupported) {
+    if (location.pathname !== '/home' && !clusterSupported) {
       return <Redirect to="/home" />;
     }
   }
diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
index 558ed5e874cd6..c479b282cd778 100644
--- a/x-pack/plugins/monitoring/public/directives/main/index.html
+++ b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -299,7 +299,7 @@ <h1 class="euiTitle euiTitle--xsmall">{{pageTitle || monitoringMain.instance}}</
     </div>
 
     <div ng-if="monitoringMain.inOverview" class="euiTabs" role="navigation">
-      <a class="euiTab" data-test-subj="clusterName">{{ pageData.cluster_name }}</a>
+      <a class="euiTab" data-test-subj="overviewTabsclusterName">{{ pageData.cluster_name }}</a>
     </div>
 
     <div ng-if="monitoringMain.inAlerts" class="euiTabs" role="navigation">
diff --git a/x-pack/test/functional/services/monitoring/cluster_overview.js b/x-pack/test/functional/services/monitoring/cluster_overview.js
index 7e888d6233ff7..215e92fa055be 100644
--- a/x-pack/test/functional/services/monitoring/cluster_overview.js
+++ b/x-pack/test/functional/services/monitoring/cluster_overview.js
@@ -12,8 +12,7 @@ export function MonitoringClusterOverviewProvider({ getService }) {
   const retry = getService('retry');
 
   const SUBJ_CLUSTER_ALERTS = `clusterAlertsContainer`;
-  const SUBJ_CLUSTER_OVERVIEW = 'clusterOverviewContainer';
-  const SUBJ_CLUSTER_NAME = `${SUBJ_CLUSTER_OVERVIEW} > clusterName`;
+  const SUBJ_CLUSTER_NAME = `overviewTabsclusterName`;
 
   const SUBJ_ES_PANEL = `clusterItemContainerElasticsearch`;
   const SUBJ_ES_STATUS = `${SUBJ_ES_PANEL} > statusIcon`;