[Stack Monitoring] functional tests - properly set test-subj attribute (

#114491) (#115137) * properly set test-subj attribute * fix prettier error * Fixing ESLinting issue Co-authored-by: Chris Cowan <chris@chriscowan.us> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kevin Lacabane <kevin.lacabane@elastic.co> Co-authored-by: Chris Cowan <chris@chriscowan.us> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Oct 15, 2021 · 588c5d1 · 588c5d1
1 parent d2075f6
commit 588c5d1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
@@ -164,13 +164,8 @@ export const KibanaInstancePage: React.FC<ComponentProps> = ({ clusters }) => {
   }, [ccs, clusterUuid, instance, services.data?.query.timefilter.timefilter, services.http]);
 
   return (
-    <PageTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="kibanaInstancePage"
-    >
-      <div data-test-subj="monitoringKibanaInstanceApp">
+    <PageTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
+      <div data-test-subj="kibanaInstancePage">
         <KibanaInstance data={data} alerts={alerts} />
       </div>
     </PageTemplate>

diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
@@ -87,12 +87,7 @@ export const KibanaInstancesPage: React.FC<ComponentProps> = ({ clusters }) => {
   ]);
 
   return (
-    <KibanaTemplate
-      title={title}
-      pageTitle={pageTitle}
-      getPageData={getPageData}
-      data-test-subj="kibanaInstancesPage"
-    >
+    <KibanaTemplate title={title} pageTitle={pageTitle} getPageData={getPageData}>
       <div data-test-subj="monitoringKibanaInstancesApp">
         <SetupModeRenderer
           productName={KIBANA_SYSTEM_ID}

diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/kibana_template.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/kibana_template.tsx
@@ -16,13 +16,15 @@ export const KibanaTemplate: React.FC<PageTemplateProps> = ({ ...props }) => {
         defaultMessage: 'Overview',
       }),
       route: '/kibana',
+      testSubj: 'kibanaOverviewPage',
     },
     {
       id: 'instances',
       label: i18n.translate('xpack.monitoring.kibanaNavigation.instancesLinkText', {
         defaultMessage: 'Instances',
       }),
       route: '/kibana/instances',
+      testSubj: 'kibanaInstancesPage',
     },
   ];
 

diff --git a/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx b/x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
@@ -107,12 +107,7 @@ export const KibanaOverviewPage: React.FC<ComponentProps> = ({ clusters }) => {
   }, [ccs, clusterUuid, services.data?.query.timefilter.timefilter, services.http]);
 
   return (
-    <KibanaTemplate
-      data-test-subj="kibanaOverviewPage"
-      getPageData={getPageData}
-      title={title}
-      pageTitle={pageTitle}
-    >
+    <KibanaTemplate getPageData={getPageData} title={title} pageTitle={pageTitle}>
       <KibanaOverview data={data} />
     </KibanaTemplate>
   );