fix functional test

elastic · Oct 18, 2021 · 1c116ba · 1c116ba
1 parent 71d7961
commit 1c116ba
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 40 deletions.
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_advanced_page.tsx
@@ -110,20 +110,22 @@ export const ElasticsearchNodeAdvancedPage: React.FC<ComponentProps> = ({ cluste
   }, [ccs, clusterUuid, services.data?.query.timefilter.timefilter, services.http, node]);
 
   return (
-    <ItemTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      id={node}
-      pageType="nodes"
-    >
-      <AdvancedNode
-        nodeSummary={data.nodeSummary}
-        alerts={alerts}
-        metrics={data.metrics}
-        onBrush={onBrush}
-        zoomInfo={zoomInfo}
-      />
-    </ItemTemplate>
+    <div data-test-subj="elasticsearchNodeDetailPage">
+      <ItemTemplate
+        title={title}
+        pageTitle={pageTitle}
+        getPageData={getPageData}
+        id={node}
+        pageType="nodes"
+      >
+        <AdvancedNode
+          nodeSummary={data.nodeSummary}
+          alerts={alerts}
+          metrics={data.metrics}
+          onBrush={onBrush}
+          zoomInfo={zoomInfo}
+        />
+      </ItemTemplate>
+    </div>
   );
 };
diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/node_page.tsx
@@ -138,27 +138,29 @@ export const ElasticsearchNodePage: React.FC<ComponentProps> = ({ clusters }) =>
       id={node}
       pageType="nodes"
     >
-      <SetupModeRenderer
-        productName={ELASTICSEARCH_SYSTEM_ID}
-        render={({ setupMode, flyoutComponent, bottomBarComponent }: SetupModeProps) => (
-          <SetupModeContext.Provider value={{ setupModeSupported: true }}>
-            {flyoutComponent}
-            <NodeReact
-              alerts={alerts}
-              labels={labels.node}
-              nodeId={node}
-              clusterUuid={clusterUuid}
-              onBrush={onBrush}
-              zoomInfo={zoomInfo}
-              toggleShowSystemIndices={toggleShowSystemIndices}
-              showSystemIndices={showSystemIndices}
-              nodesByIndices={nodesByIndicesData}
-              {...data}
-            />
-            {bottomBarComponent}
-          </SetupModeContext.Provider>
-        )}
-      />
+      <div data-test-subj="elasticsearchNodeDetailPage">
+        <SetupModeRenderer
+          productName={ELASTICSEARCH_SYSTEM_ID}
+          render={({ setupMode, flyoutComponent, bottomBarComponent }: SetupModeProps) => (
+            <SetupModeContext.Provider value={{ setupModeSupported: true }}>
+              {flyoutComponent}
+              <NodeReact
+                alerts={alerts}
+                labels={labels.node}
+                nodeId={node}
+                clusterUuid={clusterUuid}
+                onBrush={onBrush}
+                zoomInfo={zoomInfo}
+                toggleShowSystemIndices={toggleShowSystemIndices}
+                showSystemIndices={showSystemIndices}
+                nodesByIndices={nodesByIndicesData}
+                {...data}
+              />
+              {bottomBarComponent}
+            </SetupModeContext.Provider>
+          )}
+        />
+      </div>
     </ItemTemplate>
   );
 };
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }) {
   const nodesList = getService('monitoringElasticsearchNodes');
   const nodeDetail = getService('monitoringElasticsearchNodeDetail');
 
-  // FLAKY https://github.com/elastic/kibana/issues/115130
-  describe.skip('Elasticsearch node detail', () => {
+  describe('Elasticsearch node detail', () => {
     describe('Active Nodes', () => {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 

diff --git a/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js b/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js
@@ -51,8 +51,9 @@ export function MonitoringElasticsearchNodesProvider({ getService, getPageObject
       return pageId !== null;
     }
 
-    clickRowByResolver(nodeResolver) {
-      return testSubjects.click(SUBJ_NODE_LINK_PREFIX + nodeResolver);
+    async clickRowByResolver(nodeResolver) {
+      await testSubjects.click(SUBJ_NODE_LINK_PREFIX + nodeResolver);
+      await testSubjects.find('elasticsearchNodeDetailPage');
     }
 
     async waitForTableToFinishLoading() {