Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .cursor/commands/generate-regression-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Generate automated regression tests from test documentation in [`docs/incident_d
Verifies: OU-XXX
*/

import { incidentsPage } from "../../../views/incidents-page";
import { incidentsPage } from "../../../views/incidents/incidents-page";
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down Expand Up @@ -532,7 +532,7 @@ Tests both incidents chart and alerts chart tooltip behavior.
Verifies: OU-XXX
*/

import { incidentsPage } from "../../../views/incidents-page";
import { incidentsPage } from "../../../views/incidents/incidents-page";
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
6 changes: 3 additions & 3 deletions .cursor/rules/incidents-testing-guidelines.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ alwaysApply: true
description: "Development guidelines for Incidents page Cypress tests"
globs:
- "web/cypress/e2e/incidents/**/*.cy.ts"
- "web/cypress/views/incidents-page.ts"
- "web/cypress/views/incidents/incidents-page.ts"
- "web/cypress/fixtures/incidents/scenarios/**/*.yaml"
---

Expand Down Expand Up @@ -99,7 +99,7 @@ Additional context about the bug or behavior.
Verifies: OU-XXX
*/

import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';
import { CLUSTER_MONITORING_OPERATOR, CLUSTER_OBSERVABILITY_OPERATOR } from "../../../support/operators";

describe('Regression: <Section Name>', () => {
Expand Down Expand Up @@ -296,7 +296,7 @@ cy.mockIncidents([]);
### Imports
```typescript
// Always import from relative path
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

// Import types when needed
import { IncidentDefinition } from '../../support/incidents';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Shelved due to Cypress DOM snapshot accumulation causing ~10x degradation over 1
**To re-enable:** save the code block below as `web/cypress/e2e/incidents/performance/03.performance_endurance.cy.ts`.

```typescript
import { incidentsPage } from "../../../views/incidents-page";
import { incidentsPage } from "../../../views/incidents/incidents-page";
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/alerts/alerts_acm.cy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// E2E test for validating ACM Alerting UI integration with Cluster Observability Operator (COO)
import '../../support/shared/commands/auth-commands';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { acmAlertingPage } from '../../views/acm-alerting-page';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { acmAlertingPage } from '../../views/alerts/acm-alerting-page';
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
4 changes: 2 additions & 2 deletions web/cypress/e2e/alerts/alerts_bvt.cy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { alerts } from '../../fixtures/alerts/interceptWatchdogAlert';
import { runBVTMonitoringTestsNamespace } from '../../support/alerts/alerts_bvt_namespaced.cy';
import { commonPages } from '../../views/common';
import { commonPages } from '../../views/shared/common';
import { CLUSTER_MONITORING_OPERATOR } from '../../support/shared/operators';

describe('BVT: Monitoring - Namespaced', { tags: ['@alerting', '@metrics'] }, () => {
Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/alerts/alerts_ivt.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
} from '../../support/shared/operators';
import { alerts } from '../../fixtures/alerts/interceptWatchdogAlert';
import { runAllRegressionAlertsTests } from '../../support/alerts/alerts_regressions.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { guidedTour } from '../../views/tour';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { guidedTour } from '../../views/shared/tour';

describe(
'Regression: Monitoring - Alerts (Virtualization)',
Expand Down
4 changes: 2 additions & 2 deletions web/cypress/e2e/alerts/alerts_regression.cy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { runAllRegressionAlertsTests } from '../../support/alerts/alerts_regressions.cy';
import { alerts } from '../../fixtures/alerts/interceptWatchdogAlert';
import { runAllRegressionAlertsTestsNamespace } from '../../support/alerts/alerts_regressions_namespaced.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { CLUSTER_MONITORING_OPERATOR } from '../../support/shared/operators';

// Test suite for Administrator perspective
Expand Down
8 changes: 4 additions & 4 deletions web/cypress/e2e/alerts/alerts_virtualization_bvt.cy.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { runBVTAlertsTests } from '../../support/alerts/alerts_bvt.cy';
import { guidedTour } from '../../views/tour';
import { guidedTour } from '../../views/shared/tour';
import { alerts } from '../../fixtures/alerts/interceptWatchdogAlert';
import { nav } from '../../views/nav';
import { commonPages } from '../../views/common';
import { troubleshootingPanelPage } from 'cypress/views/troubleshooting-panel';
import { nav } from '../../views/shared/nav';
import { commonPages } from '../../views/shared/common';
import { troubleshootingPanelPage } from 'cypress/views/shared/troubleshooting-panel';
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/incidents_bvt.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../support/shared/operators';
import { incidentsPage } from '../../views/incidents-page';
import { incidentsPage } from '../../views/incidents/incidents-page';

describe('BVT: Incidents - UI', { tags: ['@cluster-health-analyzer'] }, () => {
before(() => {
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/incidents_e2e.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../support/shared/operators';
import { incidentsPage } from '../../views/incidents-page';
import { incidentsPage } from '../../views/incidents/incidents-page';

describe('BVT: Incidents - e2e', { tags: ['@slow', '@cluster-health-analyzer'] }, () => {
let currentAlertName: string;
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/incidents_mocking_example.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../support/shared/operators';
import { incidentsPage } from '../../views/incidents-page';
import { incidentsPage } from '../../views/incidents/incidents-page';

describe('Incidents - Mocking Examples', { tags: ['@cluster-health-analyzer'] }, () => {
before(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ median observed time.
Verifies: OBSINTA-1006
*/

import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';
import { BenchmarkCollector } from '../../../support/shared/commands/benchmark-utils';
import {
CLUSTER_MONITORING_OPERATOR,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ this test measures incremental re-render cost during a realistic user session.
Verifies: OBSINTA-1006
*/

import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';
import { BenchmarkCollector } from '../../../support/shared/commands/benchmark-utils';
import {
CLUSTER_MONITORING_OPERATOR,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

describe(
'Regression: Time-Based Alert Resolution (E2E with Firing Alerts)',
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/regression/filtering.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

describe('Regression: Incidents Filtering', { tags: ['@cluster-health-analyzer'] }, () => {
before(() => {
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/regression/interval.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

describe(
'Regression: Mixed Severity Interval Boundary Times',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { nav } from '../../../views/nav';
import { incidentsPage } from '../../../views/incidents/incidents-page';
import { nav } from '../../../views/shared/nav';

describe(
'Regression: Silences Not Applied Correctly',
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/regression/stress_test_ui.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

const MAX_GAP_STANDARD = 250;
const MAX_GAP_RELAXED = 500;
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/regression/ui_interaction.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

describe('Regression: Redux State Management', { tags: ['@cluster-health-analyzer'] }, () => {
before(() => {
Expand Down
2 changes: 1 addition & 1 deletion web/cypress/e2e/incidents/regression/ui_regressions.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../../support/shared/operators';
import { incidentsPage } from '../../../views/incidents-page';
import { incidentsPage } from '../../../views/incidents/incidents-page';

const ARROW_HEIGHT = 12;
const ALLOWED_MARGIN = 8;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CLUSTER_MONITORING_OPERATOR } from '../../support/shared/operators';
import { runAllRegressionLegacyDashboardsTests } from '../../support/legacy-dashboards/legacy_dashboards_regressions.cy';
import { runAllRegressionLegacyDashboardsTestsNamespace } from '../../support/legacy-dashboards/legacy_dashboards_regressions_namespaced.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';

// Test suite for Administrator perspective
describe(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
} from '../../support/shared/operators';
import { runAllRegressionLegacyDashboardsTests } from '../../support/legacy-dashboards/legacy_dashboards_regressions.cy';
import { runAllRegressionLegacyDashboardsTestsNamespace } from '../../support/legacy-dashboards/legacy_dashboards_regressions_namespaced.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { guidedTour } from '../../views/tour';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { guidedTour } from '../../views/shared/tour';

describe(
'Regression: Monitoring - Legacy Dashboards (Virtualization)',
Expand Down
4 changes: 2 additions & 2 deletions web/cypress/e2e/metrics/metrics_regression.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
runAllRegressionMetricsTestsNamespace1,
runAllRegressionMetricsTestsNamespace2,
} from '../../support/metrics/metrics_regressions_namespaced.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { CLUSTER_MONITORING_OPERATOR } from '../../support/shared/operators';

// Test suite for Administrator perspective
Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/metrics/metrics_virtualization_ivt.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
runAllRegressionMetricsTestsNamespace1,
runAllRegressionMetricsTestsNamespace2,
} from '../../support/metrics/metrics_regressions_namespaced.cy';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { guidedTour } from '../../views/tour';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { guidedTour } from '../../views/shared/tour';
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
10 changes: 5 additions & 5 deletions web/cypress/e2e/perses-dashboards/lightspeed_integration.cy.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { operatorAuthUtils } from '../../support/shared/commands/auth-commands';
import { nav } from '../../views/nav';
import { commonPages } from '../../views/common';
import { listPersesDashboardsPage } from '../../views/perses-dashboards-list-dashboards';
import { persesCreateDashboardsPage } from '../../views/perses-dashboards-create-dashboard';
import { persesDashboardsPage } from '../../views/perses-dashboards';
import { nav } from '../../views/shared/nav';
import { commonPages } from '../../views/shared/common';
import { listPersesDashboardsPage } from '../../views/perses-dashboards/perses-dashboards-list-dashboards';
import { persesCreateDashboardsPage } from '../../views/perses-dashboards/perses-dashboards-create-dashboard';
import { persesDashboardsPage } from '../../views/perses-dashboards/perses-dashboards';
import { persesMUIDataTestIDs } from '@/shared/constants/data-test';

const PROMPT = 'visualize CPU consumption in the openshift-monitoring namespace in last 2 hours';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
//TODO: rename after customizable-dashboards gets merged
import { runBVTCOOPersesTests1 } from '../../support/perses/perses_bvt_admin.cy';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { runCOOCreatePersesTests } from '../../support/perses/perses_create_admin.cy';
import { operatorAuthUtils } from '../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
TEMPO_OPERATOR,
} from '../../support/shared/operators';
import { runCOOCreateImportPersesTests } from '../../support/perses/perses_create_import_admin.cy';
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';

describe(
'COO - Dashboards (Perses) - Perses Global Datasources with Tempo and Loki',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { runCOOEditPersesTests1 } from '../../support/perses/perses_edit_admin_1.cy';
import { runCOOEditPersesTests } from '../../support/perses/perses_edit_admin.cy';
import { operatorAuthUtils } from '../../support/shared/commands/auth-commands';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { runCOOImportPersesTests } from '../../support/perses/perses_import_admin.cy';
import { operatorAuthUtils } from '../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import {
runCOOListPersesDuplicateDashboardTests,
runCOOListPersesTests,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Not finished
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { runBVTCOOPersesTests1 } from '../../support/perses/perses_bvt_admin.cy';
import { guidedTour } from '../../views/tour';
import { commonPages } from '../../views/common';
import { guidedTour } from '../../views/shared/tour';
import { commonPages } from '../../views/shared/common';
import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser1 } from '../../../support/perses/rbac/perses_user1.cy';
import {
CLUSTER_MONITORING_OPERATOR,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser2 } from '../../../support/perses/rbac/perses_user2.cy';
import { operatorAuthUtils } from '../../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser3 } from '../../../support/perses/rbac/perses_user3.cy';
import { operatorAuthUtils } from '../../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser4 } from '../../../support/perses/rbac/perses_user4.cy';
import { operatorAuthUtils } from '../../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser5 } from '../../../support/perses/rbac/perses_user5.cy';
import { operatorAuthUtils } from '../../../support/shared/commands/auth-commands';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { nav } from '../../../views/nav';
import { nav } from '../../../views/shared/nav';
import { runCOORBACPersesTestsDevUser6 } from '../../../support/perses/rbac/perses_user6.cy';
import { operatorAuthUtils } from '../../../support/shared/commands/auth-commands';

Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/shared/admin_perspective_bvt.cy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { nav } from '../../views/nav';
import { nav } from '../../views/shared/nav';
import { alerts } from '../../fixtures/alerts/interceptWatchdogAlert';
import { runBVTAlertsTests } from '../../support/alerts/alerts_bvt.cy';
import { commonPages } from '../../views/common';
import { overviewPage } from '../../views/overview-page';
import { commonPages } from '../../views/shared/common';
import { overviewPage } from '../../views/shared/overview-page';
import { CLUSTER_MONITORING_OPERATOR } from '../../support/shared/operators';

describe(
Expand Down
6 changes: 3 additions & 3 deletions web/cypress/e2e/shared/coo_submenus.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import {
CLUSTER_MONITORING_OPERATOR,
CLUSTER_OBSERVABILITY_OPERATOR,
} from '../../support/shared/operators';
import { commonPages } from '../../views/common';
import { nav } from '../../views/nav';
import { troubleshootingPanelPage } from '../../views/troubleshooting-panel';
import { commonPages } from '../../views/shared/common';
import { nav } from '../../views/shared/nav';
import { troubleshootingPanelPage } from '../../views/shared/troubleshooting-panel';

describe(
'BVT: COO',
Expand Down
Loading