OU-1550: add idempotent ensureMonitoringPlugin command

.cursor/commands/generate-regression-test.md

@@ -94,7 +94,7 @@ import { incidentsPage } from "../../../views/incidents-page";
 
 describe("Regression: [Section Name]", () => {
   before(() => {
-    cy.beforeBlockCOO();
+    cy.ensureMonitoringConsolePlugin();
   });
 
   beforeEach(() => {
@@ -475,7 +475,7 @@ Continue? (y/n/specify)
 **Automated checks (AI should verify):**
 
 - [ ] File naming matches `XX.reg_<section-name>.cy.ts`
-- [ ] Uses `cy.beforeBlockCOO()` in `before()` hook
+- [ ] Uses `cy.ensureMonitoringConsolePlugin()` in `before()` hook
 - [ ] Uses `incidentsPage.goTo()` in `beforeEach()`
 - [ ] Uses `cy.mockIncidentFixture()` with valid fixture path
 - [ ] No emojis in cy.log() statements
@@ -526,7 +526,7 @@ import { incidentsPage } from "../../../views/incidents-page";
 
 describe("Regression: Tooltip Positioning", () => {
   before(() => {
-    cy.beforeBlockCOO();
+    cy.ensureMonitoringConsolePlugin();
   });
 
   beforeEach(() => {

.cursor/rules/incidents-testing-guidelines.mdc

@@ -103,7 +103,7 @@ import { incidentsPage } from '../../../views/incidents-page';
 
 describe('Regression: <Section Name>', () => {
   before(() => {
-    cy.beforeBlockCOO();
+    cy.ensureMonitoringConsolePlugin();
   });
 
   beforeEach(() => {
@@ -125,7 +125,7 @@ describe('Regression: <Section Name>', () => {
 ### Required Elements
 - File header comment with purpose and issue reference (e.g., "Verifies: OU-XXX")
 - Import `incidentsPage` from relative path
-- Use `cy.beforeBlockCOO()` in `before()` hook
+- Use `cy.ensureMonitoringConsolePlugin()` in `before()` hook
 - Use `incidentsPage.goTo()` in `beforeEach()`
 - Use `cy.mockIncidentFixture()` for test data
 

Makefile

@@ -47,6 +47,7 @@ i18n-frontend:
 .PHONY: lint-frontend
 lint-frontend:
 	cd web && npm run lint
+	cd web && npm run lint:tsc:cypress
 
 .PHONY: install-backend
 install-backend:

docs/incident_detection/tests/performance/03.endurance_test_source.md

@@ -25,7 +25,7 @@ describe(
   { tags: ["@cluster-health-analyzer", "@coo"] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/component/labels.cy.tsx

@@ -1,4 +1,4 @@
-import { Labels } from '@/shared/components/labels';
+import { Labels } from '@/shared/components/Labels';
 
 describe('Labels', () => {
   it('renders "No labels" when labels is empty', () => {

web/cypress/e2e/coo/01.coo_bvt.cy.ts

@@ -4,7 +4,7 @@ import { troubleshootingPanelPage } from '../../views/troubleshooting-panel';
 
 describe('BVT: COO', { tags: ['@alerting', '@coo'] }, () => {
   before(() => {
-    cy.beforeBlockCOO();
+    cy.ensureMonitoringConsolePlugin();
   });
 
   it('1. Admin perspective - Observe Menu', () => {

web/cypress/e2e/coo/02.acm_alerting_ui.cy.ts

@@ -12,8 +12,8 @@ import {
   testAlertsRegression,
 } from 'cypress/support/monitoring/01.reg_alerts.cy';
 import { listPage } from 'cypress/views/list-page';
+import { CLUSTER_MONITORING_OPERATOR } from '../../support/operators';
 import { CustomerPerspectiveName } from '@/shared/constants/perspective';
-import { CLUSTER_MONITORING_OPERATOR } from 'cypress/support/operators';
 
 const expectedAlerts = ['Watchdog', 'Watchdog-spoke', 'ClusterCPUHealth-jb'];
 

web/cypress/e2e/incidents/00.coo_incidents_e2e.cy.ts

@@ -8,7 +8,7 @@ describe('BVT: Incidents - e2e', { tags: ['@cluster-health-analyzer', '@coo', '@
   let currentAlertName: string;
 
   before(() => {
-    cy.beforeBlockCOO({
+    cy.ensureMonitoringConsolePlugin({
       dashboards: false,
       troubleshootingPanel: false,
     });

web/cypress/e2e/incidents/01.incidents.cy.ts

@@ -11,7 +11,7 @@ import { incidentsPage } from '../../views/incidents-page';
 
 describe('BVT: Incidents - UI', { tags: ['@cluster-health-analyzer', '@coo'] }, () => {
   before(() => {
-    cy.beforeBlockCOO({
+    cy.ensureMonitoringConsolePlugin({
       dashboards: false,
       troubleshootingPanel: false,
     });

web/cypress/e2e/incidents/02.incidents-mocking-example.cy.ts

@@ -11,7 +11,7 @@ import { incidentsPage } from '../../views/incidents-page';
 
 describe('Incidents - Mocking Examples', { tags: ['@cluster-health-analyzer', '@coo'] }, () => {
   before(() => {
-    cy.beforeBlockCOO({
+    cy.ensureMonitoringConsolePlugin({
       dashboards: false,
       troubleshootingPanel: false,
     });

web/cypress/e2e/incidents/performance/01.performance_benchmark.cy.ts

@@ -42,7 +42,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'], numTestsKeptInMemory: 0 },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/performance/02.performance_walkthrough.cy.ts

@@ -26,7 +26,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'], numTestsKeptInMemory: 0 },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/01.reg_filtering.cy.ts

@@ -12,7 +12,7 @@ import { incidentsPage } from '../../../views/incidents-page';
 
 describe('Regression: Incidents Filtering', { tags: ['@cluster-health-analyzer', '@coo'] }, () => {
   before(() => {
-    cy.beforeBlockCOO({
+    cy.ensureMonitoringConsolePlugin({
       dashboards: false,
       troubleshootingPanel: false,
     });

web/cypress/e2e/incidents/regression/02.reg_ui_charts_comprehensive.cy.ts

@@ -91,7 +91,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/02.reg_ui_tooltip_boundary_times.cy.ts

@@ -18,7 +18,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo', '@xfail'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/03-04.reg_e2e_firing_alerts.cy.ts

@@ -26,7 +26,7 @@ describe(
     let currentAlertName: string;
 
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/03.reg_api_calls.cy.ts

@@ -21,7 +21,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });
@@ -134,7 +134,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/04.reg_redux_effects.cy.ts

@@ -20,7 +20,7 @@ describe(
   { tags: ['@cluster-health-analyzer', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: false,
         troubleshootingPanel: false,
       });

web/cypress/e2e/incidents/regression/05.reg_stress_testing_ui.cy.ts

@@ -18,7 +18,7 @@ const MAX_GAP_RELAXED = 500;
 
 describe('Regression: Stress Testing UI', { tags: ['@cluster-health-analyzer', '@coo'] }, () => {
   before(() => {
-    cy.beforeBlockCOO({
+    cy.ensureMonitoringConsolePlugin({
       dashboards: false,
       troubleshootingPanel: false,
     });

web/cypress/e2e/monitoring/00.bvt_admin.cy.ts

@@ -10,7 +10,7 @@ describe(
   { tags: ['@alerting', '@legacy-dashboards', '@metrics', '@targets'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {

web/cypress/e2e/monitoring/00.bvt_dev.cy.ts

@@ -7,7 +7,7 @@ import { CLUSTER_MONITORING_OPERATOR } from '../../support/operators';
 
 describe('BVT: Monitoring - Namespaced', { tags: ['@alerting'] }, () => {
   before(() => {
-    cy.beforeBlock();
+    cy.ensureMonitoringPlugin();
   });
 
   beforeEach(() => {

web/cypress/e2e/monitoring/regression/01.reg_alerts_admin.cy.ts

@@ -1,8 +1,10 @@
+import { CLUSTER_MONITORING_OPERATOR } from 'cypress/support/operators';
 import { alerts } from '../../../fixtures/monitoring/alert';
 import {
   testAlertsCorePlatformHeaderRegression,
   testAlertsRegression,
 } from '../../../support/monitoring/01.reg_alerts.cy';
+import { testAlertsRegressionNamespace } from '../../../support/monitoring/04.reg_alerts_namespace.cy';
 import { commonPages } from '../../../views/common';
 import { nav } from '../../../views/nav';
 import { CustomerPerspectiveName } from '@/shared/constants/perspective';
@@ -13,7 +15,7 @@ describe(
   { tags: ['@alerting', '@metrics'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
       cy.switchPerspective('Core platform');
     });
 
@@ -32,3 +34,24 @@ describe(
     testAlertsRegression(CustomerPerspectiveName.CorePlatform);
   },
 );
+
+describe(
+  'Regression: Monitoring - Alerts Namespaced (Administrator)',
+  { tags: ['@alerting'] },
+  () => {
+    before(() => {
+      cy.ensureMonitoringPlugin();
+    });
+
+    beforeEach(() => {
+      alerts.interceptWatchdogAlert();
+      nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+      commonPages.titleShouldHaveText('Alerting');
+      alerts.interceptWatchdogAlert();
+      cy.changeNamespace(CLUSTER_MONITORING_OPERATOR.namespace);
+    });
+
+    // Run tests in Administrator perspective
+    testAlertsRegressionNamespace(CustomerPerspectiveName.CorePlatform);
+  },
+);

web/cypress/e2e/monitoring/regression/01.reg_alerts_dev.cy.ts

@@ -10,7 +10,7 @@ describe(
   { tags: ['@alerting'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {

web/cypress/e2e/monitoring/regression/02.reg_metrics_admin_1.cy.ts

@@ -8,7 +8,7 @@ import { CustomerPerspectiveName } from '@/shared/constants/perspective';
 // Test suite for Administrator perspective
 describe('Regression: Monitoring - Metrics (Administrator)', { tags: ['@metrics'] }, () => {
   before(() => {
-    cy.beforeBlock();
+    cy.ensureMonitoringPlugin();
   });
 
   beforeEach(() => {
@@ -27,7 +27,7 @@ describe(
   { tags: ['@metrics'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {

web/cypress/e2e/monitoring/regression/02.reg_metrics_admin_2.cy.ts

@@ -8,7 +8,7 @@ import { CustomerPerspectiveName } from '@/shared/constants/perspective';
 // Test suite for Administrator perspective
 describe('Regression: Monitoring - Metrics (Administrator)', { tags: ['@metrics'] }, () => {
   before(() => {
-    cy.beforeBlock();
+    cy.ensureMonitoringPlugin();
   });
 
   beforeEach(() => {
@@ -27,7 +27,7 @@ describe(
   { tags: ['@metrics'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {

web/cypress/e2e/monitoring/regression/03.reg_legacy_dashboards_admin.cy.ts

@@ -11,13 +11,13 @@ describe(
   { tags: ['@legacy-dashboards'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {
-      // When running only this file, beforeBlock changes the namespace to openshift-monitoring so
-      // we need to change it back to All Projects before landing to Dashboards page in order to
-      // have API Performance dashboard loaded by default
+      // When running only this file, ensureMonitoringPlugin changes the namespace to
+      // openshift-monitoring so we need to change it back to All Projects before
+      //  landing to Dashboards page in order to have API Performance dashboard loaded by default
       nav.sidenav.clickNavLink(['Observe', 'Metrics']);
       commonPages.titleShouldHaveText('Metrics');
       cy.changeNamespace('All Projects');
@@ -37,7 +37,7 @@ describe(
   { tags: ['@legacy-dashboards'] },
   () => {
     before(() => {
-      cy.beforeBlock();
+      cy.ensureMonitoringPlugin();
     });
 
     beforeEach(() => {

web/cypress/e2e/perses/00.coo_bvt_perses_admin.cy.ts

@@ -8,7 +8,7 @@ describe(
   { tags: ['@perses-dashboards', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: true,
         troubleshootingPanel: false,
       });

web/cypress/e2e/perses/01.coo_list_perses_admin.cy.ts

@@ -12,7 +12,7 @@ describe(
   { tags: ['@perses-dashboards', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: true,
         troubleshootingPanel: false,
       });
@@ -38,7 +38,7 @@ describe(
   { tags: ['@perses-dashboards', '@coo'] },
   () => {
     before(() => {
-      cy.beforeBlockCOO();
+      cy.ensureMonitoringConsolePlugin();
       cy.switchPerspective('Core platform');
       cy.cleanupPersesTestDashboardsBeforeTests();
     });

web/cypress/e2e/perses/05.coo_tempo_loki_admin.cy.ts

@@ -20,7 +20,7 @@ describe(
       cy.cleanupLoggingUIPlugin();
       cy.cleanupExtraDashboards();
 
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: true,
         troubleshootingPanel: false,
       });

web/cypress/e2e/perses/99.coo_rbac_perses_user1.cy.ts

@@ -8,7 +8,7 @@ describe(
   () => {
     before(() => {
       // Setup COO and Perses dashboards (requires admin privileges)
-      cy.beforeBlockCOO({
+      cy.ensureMonitoringConsolePlugin({
         dashboards: true,
         troubleshootingPanel: false,
       });
@@ -17,7 +17,8 @@ describe(
       cy.setupPersesRBACandExtraDashboards();
 
       // Clear Cypress session cache and logout
-      // This is critical because beforeBlockCOO uses cy.session() which caches the login state
+      // This is critical because ensureMonitoringConsolePlugin uses cy.session()
+      // which caches login state
       cy.log('Clearing Cypress session cache to ensure fresh login');
       cy.then(() => {
         Cypress.session.clearAllSavedSessions();