Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Oct 12, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
389b510
properly set test-subj attribute
klacabane Oct 11, 2021
2d49dc3
fix prettier error
klacabane Oct 11, 2021
ab42958
Merge branch 'master' into fix-kibana-integ-tests
simianhacker Oct 11, 2021
ef37951
Merge branch 'master' into fix-kibana-integ-tests
kibanamachine Oct 11, 2021
ef9bfcc
Fixing ESLinting issue
simianhacker Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions x-pack/plugins/monitoring/public/application/pages/kibana/instance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 1 addition & 6 deletions x-pack/plugins/monitoring/public/application/pages/kibana/instances.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/monitoring/public/application/pages/kibana/kibana_template.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
];

Expand Down
7 changes: 1 addition & 6 deletions x-pack/plugins/monitoring/public/application/pages/kibana/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down