Skip to content

Commit 431febe

Browse files
committed
fix loop
1 parent 1d87d9d commit 431febe

3 files changed

Lines changed: 10 additions & 14 deletions

File tree

web/cypress/support/monitoring/03.reg_legacy_dashboards.cy.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { nav } from '../../views/nav';
22
import { legacyDashboardsPage } from '../../views/legacy-dashboards';
3-
import { API_PERFORMANCE_DASHBOARD_PANELS, LegacyDashboardsDashboardDropdown, MetricsPageQueryInput, WatchdogAlert } from '../../fixtures/monitoring/constants';
3+
import { LegacyDashboardsDashboardDropdown, MetricsPageQueryInput, WatchdogAlert } from '../../fixtures/monitoring/constants';
44
import { Classes, LegacyDashboardPageTestIDs, DataTestIDs } from '../../../src/components/data-test';
55
import { metricsPage } from '../../views/metrics';
66
import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
@@ -35,9 +35,7 @@ export function testLegacyDashboardsRegression(perspective: PerspectiveConfig) {
3535
legacyDashboardsPage.clickDashboardDropdown('API_PERFORMANCE');
3636

3737
cy.log('1.5 Dashboard API Performance panels');
38-
for (const panel of Object.values(API_PERFORMANCE_DASHBOARD_PANELS)) {
39-
legacyDashboardsPage.dashboardAPIPerformancePanelAssertion(panel);
40-
}
38+
legacyDashboardsPage.dashboardAPIPerformancePanelAssertion();
4139

4240
cy.log('1.6 Inspect - API Request Duration by Verb - 99th Percentile');
4341
cy.byTestID(LegacyDashboardPageTestIDs.Inspect).eq(0).scrollIntoView().should('be.visible').click();

web/cypress/support/monitoring/06.reg_legacy_dashboards_namespace.cy.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { nav } from '../../views/nav';
22
import { legacyDashboardsPage } from '../../views/legacy-dashboards';
3-
import { KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS, LegacyDashboardsDashboardDropdownNamespace, MetricsPageQueryInputByNamespace, WatchdogAlert } from '../../fixtures/monitoring/constants';
3+
import { LegacyDashboardsDashboardDropdownNamespace, MetricsPageQueryInputByNamespace, WatchdogAlert } from '../../fixtures/monitoring/constants';
44
import { Classes, LegacyDashboardPageTestIDs, DataTestIDs } from '../../../src/components/data-test';
55
import { metricsPage } from '../../views/metrics';
66
import { alertingRuleDetailsPage } from '../../views/alerting-rule-details-page';
@@ -34,9 +34,7 @@ export function testLegacyDashboardsRegressionNamespace(perspective: Perspective
3434
legacyDashboardsPage.dashboardDropdownAssertion(LegacyDashboardsDashboardDropdownNamespace);
3535

3636
cy.log('1.5 Dashboard Kubernetes Compute Resources Namespace Pods panels');
37-
for (const panel of Object.values(KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS)) {
38-
legacyDashboardsPage.dashboardKubernetesComputeResourcesNamespacePodsPanelAssertion(panel);
39-
}
37+
legacyDashboardsPage.dashboardKubernetesComputeResourcesNamespacePodsPanelAssertion();
4038

4139
cy.log('1.6 Inspect - CPU Utilisation (from requests)');
4240
cy.byTestID(LegacyDashboardPageTestIDs.Inspect).eq(0).scrollIntoView().should('be.visible').click();

web/cypress/views/legacy-dashboards.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,25 @@ export const legacyDashboardsPage = {
7777
cy.byTestID(LegacyDashboardPageTestIDs.DashboardDropdown).find('button').should('be.visible').click();
7878
},
7979

80-
dashboardAPIPerformancePanelAssertion: (panel: API_PERFORMANCE_DASHBOARD_PANELS) => {
80+
dashboardAPIPerformancePanelAssertion: () => {
8181
cy.log('legacyDashboardsPage.dashboardAPIPerformancePanelAssertion');
8282
function formatDataTestID(panel: API_PERFORMANCE_DASHBOARD_PANELS): string {
8383
return panel.toLowerCase().replace(/\s+/g, '-').concat('-chart');
8484
}
85-
const dataTestID = Object.values(API_PERFORMANCE_DASHBOARD_PANELS).map(formatDataTestID);
86-
dataTestID.forEach((dataTestID) => {
85+
const dataTestIDs = Object.values(API_PERFORMANCE_DASHBOARD_PANELS).map(formatDataTestID);
86+
dataTestIDs.forEach((dataTestID) => {
8787
cy.log('Data test ID: ' + dataTestID);
8888
cy.byTestID(dataTestID).scrollIntoView().should('be.visible');
8989
});
9090
},
9191

92-
dashboardKubernetesComputeResourcesNamespacePodsPanelAssertion: (panel: KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS) => {
92+
dashboardKubernetesComputeResourcesNamespacePodsPanelAssertion: () => {
9393
cy.log('legacyDashboardsPage.dashboardKubernetesComputeResourcesNamespacePodsPanelAssertion');
9494
function formatDataTestID(panel: KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS): string {
9595
return panel.toLowerCase().replace(/\s+/g, '-').concat('-chart');
9696
}
97-
const dataTestID = Object.values(KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS).map(formatDataTestID);
98-
dataTestID.forEach((dataTestID) => {
97+
const dataTestIDs = Object.values(KUBERNETES_COMPUTE_RESOURCES_NAMESPACE_PODS_PANELS).map(formatDataTestID);
98+
dataTestIDs.forEach((dataTestID) => {
9999
cy.log('Data test ID: ' + dataTestID);
100100
cy.byTestID(dataTestID).scrollIntoView().should('be.visible');
101101
});

0 commit comments

Comments
 (0)