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

Jump to bottom

[Stack monitoring] Fix clusters functional tests when react is enabled #114982

Merged
merged 2 commits into from
Oct 14, 2021
Merged

[Stack monitoring] Fix clusters functional tests when react is enabled #114982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd4b7c
Fix test subjects for overview page
estermv Oct 14, 2021
202bbb5
fix pathname matching
estermv Oct 14, 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
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/public/application/pages/cluster/overview_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const ClusterOverview: React.FC<{}> = () => {
{
id: 'clusterName',
label: clusters[0].cluster_name,
testSubj: 'clusterName',
testSubj: 'overviewTabsclusterName',
route: '/overview',
},
];
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/public/application/route_init.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />;
}
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/public/directives/main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the page structure is different in react and in angular, I changed the test-subj to be more specific so tests works in both versions.

<a class="euiTab" data-test-subj="overviewTabsclusterName">{{ pageData.cluster_name }}</a>
</div>

<div ng-if="monitoringMain.inAlerts" class="euiTabs" role="navigation">
Expand Down
3 changes: 1 addition & 2 deletions x-pack/test/functional/services/monitoring/cluster_overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Expand Down