From b87894f1e2a55dbcbb2f0eb68ade0e971f75bd1d Mon Sep 17 00:00:00 2001
From: Mat Schaffer <mat@elastic.co>
Date: Fri, 15 Oct 2021 18:25:55 +0900
Subject: [PATCH] [7.x] [Stack Monitoring] Fix monitoring func test (#115013)
 (#115140)

* [Stack Monitoring] Fix monitoring func test (#115013)

* add noDataContainer test-subj

* remove unnecessary test step

* Fix test subjects for overview page

* remove unused service

* update NoData component snapshots

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

* Update snaps to include items not backported from https://github.com/elastic/kibana/pull/52276

Co-authored-by: Kevin Lacabane <kevin.lacabane@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../__snapshots__/no_data.test.js.snap        | 12 +++++++
 .../public/components/no_data/no_data.js      | 32 +++++++++++++++----
 .../monitoring/enable_monitoring/index.js     |  3 --
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
index b6d117fb3269cf..8852d104fe00ac 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__snapshots__/no_data.test.js.snap
@@ -3,7 +3,13 @@
 exports[`NoData should show a default message if reason is unknown 1`] = `
 <div
   class="euiPage euiPage--paddingMedium euiPage--grow"
+  data-test-subj="noDataContainer"
 >
+  <h1
+    class="euiScreenReaderOnly"
+  >
+    No monitoring data found.
+  </h1>
   <div
     class="euiPageBody euiPageBody--borderRadiusNone euiPageBody--restrictWidth-custom"
     style="max-width:600px"
@@ -89,7 +95,13 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
 exports[`NoData should show text next to the spinner while checking a setting 1`] = `
 <div
   class="euiPage euiPage--paddingMedium euiPage--grow"
+  data-test-subj="noDataContainer"
 >
+  <h1
+    class="euiScreenReaderOnly"
+  >
+    No monitoring data found.
+  </h1>
   <div
     class="euiPageBody euiPageBody--borderRadiusNone euiPageBody--restrictWidth-custom"
     style="max-width:600px"
diff --git a/x-pack/plugins/monitoring/public/components/no_data/no_data.js b/x-pack/plugins/monitoring/public/components/no_data/no_data.js
index 0deb55a049b5bd..2effc4187233d1 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/no_data.js
+++ b/x-pack/plugins/monitoring/public/components/no_data/no_data.js
@@ -56,9 +56,13 @@ export function NoData(props) {
     window.location.hash = getSafeForExternalLink('#/elasticsearch/nodes');
   }
 
+  const NoDataContainer = ({ children }) => {
+    return <EuiPage data-test-subj="noDataContainer">{children}</EuiPage>;
+  };
+
   if (isCloudEnabled) {
     return (
-      <EuiPage>
+      <NoDataContainer>
         <EuiScreenReaderOnly>
           <h1>
             <FormattedMessage
@@ -97,13 +101,21 @@ export function NoData(props) {
             <CloudDeployment />
           </EuiPageContent>
         </EuiPageBody>
-      </EuiPage>
+      </NoDataContainer>
     );
   }
 
   if (useInternalCollection) {
     return (
-      <EuiPage>
+      <NoDataContainer>
+        <EuiScreenReaderOnly>
+          <h1>
+            <FormattedMessage
+              id="xpack.monitoring.no_data.internal_collection.heading"
+              defaultMessage="No monitoring data found."
+            />
+          </h1>
+        </EuiScreenReaderOnly>
         <EuiPageBody restrictWidth={600}>
           <EuiPageContent
             verticalPosition="center"
@@ -132,12 +144,20 @@ export function NoData(props) {
             ) : null}
           </EuiPageContent>
         </EuiPageBody>
-      </EuiPage>
+      </NoDataContainer>
     );
   }
 
   return (
-    <EuiPage>
+    <NoDataContainer>
+      <EuiScreenReaderOnly>
+        <h1>
+          <FormattedMessage
+            id="xpack.monitoring.no_data.heading"
+            defaultMessage="No monitoring data found."
+          />
+        </h1>
+      </EuiScreenReaderOnly>
       <EuiPageBody restrictWidth={600}>
         <EuiPageContent
           verticalPosition="center"
@@ -195,7 +215,7 @@ export function NoData(props) {
           </EuiButtonEmpty>
         </EuiPageContent>
       </EuiPageBody>
-    </EuiPage>
+    </NoDataContainer>
   );
 }
 
diff --git a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
index 79bd479c45a177..cce6401453d216 100644
--- a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
@@ -11,7 +11,6 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['monitoring', 'common', 'header']);
   const esSupertest = getService('esSupertest');
   const noData = getService('monitoringNoData');
-  const testSubjects = getService('testSubjects');
   const clusterOverview = getService('monitoringClusterOverview');
   const retry = getService('retry');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
@@ -53,8 +52,6 @@ export default function ({ getService, getPageObjects }) {
       // Here we are checking that once Monitoring is enabled,
       // it moves on to the cluster overview page.
       await retry.tryForTime(20000, async () => {
-        // Click the refresh button
-        await testSubjects.click('querySubmitButton');
         await clusterOverview.closeAlertsModal();
         expect(await clusterOverview.isOnClusterOverview()).to.be(true);
       });