test: Randomize alert name and minor fixes

00.coo_incidents_e2e
- the created alert name is different for every test
- improved test name and logging

01.incidents.cy.ts
- improved test names and logging
- merged test 5 and 6 together
- added toggling the button in test 1

commands.ts
- command for logging when using cy.waitUntil

incident-page.ts
- more stable lookup for the alert bars

Author: DavidRajnoha

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

@@ -1,5 +1,6 @@
 /*
 The test verifies the whole lifecycle of the Incident feature, without any external dependencies.
+The run time can be 15 - 20 minutes. (Waiting untill the incident detection captures the new alert)
 */
 import { commonPages } from '../../views/common';
 import { incidentsPage } from '../../views/incidents-page';
@@ -20,40 +21,50 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('Incidents', () => {
+describe('BVT: Incidents - e2e', () => {
+  let currentAlertName: string;
+
   before(() => {
     cy.afterBlockCOO(MCP, MP); // Following cypher best practices, the cleanup is done before the test block
     cy.beforeBlockCOO(MCP, MP);
-    cy.createKubePodCrashLoopingAlert();
+    
+    cy.cleanupIncidentPrometheusRules(); 
+
+    // Create the alert and capture the random name
+    cy.createKubePodCrashLoopingAlert().then((alertName) => {
+      currentAlertName = alertName;
+      cy.log(`Test will look for alert: ${currentAlertName}`);
+    });
   });
 
   after(() => {
     cy.afterBlockCOO(MCP, MP); // For compatibility with other tests
   });
 
-  it('Admin Perspective - Incidents tab renders and responds to interactions', () => {
-    cy.log('1.1 Navigate to Alerting → Incidents');
-    incidentsPage.goTo();
-    commonPages.titleShouldHaveText('Incidents');
-  });
-
-  it('Incident with KubePodCrashLooping alert is present in the alerts table', () => {
+  it('1. Admin perspective - Incidents page - Incident with custom alert lifecycle', () => {
+    cy.log('1.1 Navigate to Incidents page and clear filters');
     incidentsPage.goTo();
     commonPages.titleShouldHaveText('Incidents');
     incidentsPage.clearAllFilters();
 
     const intervalMs = 60_000;
-    const maxMinutes = 20; 
+    const maxMinutes = 30; 
 
-    cy.waitUntil(() => incidentsPage.findIncidentWithAlert('KubePodCrashLooping'), { 
-      interval: intervalMs, 
-      timeout: maxMinutes * intervalMs 
-    });
+    cy.log('1.2 Wait for incident with custom alert to appear');
+    cy.waitUntilWithCustomTimeout(
+      () => incidentsPage.findIncidentWithAlert(currentAlertName),
+      { 
+        interval: intervalMs, 
+        timeout: maxMinutes * intervalMs,
+        timeoutMessage: `Custom timeout: Incident with alert "${currentAlertName}" did not appear within ${maxMinutes} minutes.`
+      }
+    );
 
+    cy.log('1.3 Verify custom alert appears in alerts table');
     incidentsPage
       .elements
       .alertsTable()
-      .contains('KubePodCrashLooping')
+      .contains(currentAlertName)
       .should('exist');
   });
 });

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

@@ -31,7 +31,7 @@ const NAMESPACE = 'openshift-monitoring';
 const SEVERITY = 'Critical';
 const ALERT_DESC = 'This is an alert meant to ensure that the entire alerting pipeline is functional. This alert is always firing, therefore it should always be firing in Alertmanager and always fire against a receiver. There are integrations with various notification mechanisms that send a notification when this alert is not firing. For example the "DeadMansSnitch" integration in PagerDuty.'
 const ALERT_SUMMARY = 'An alert that should always be firing to certify that Alertmanager is working properly.'
-describe('Incidents', () => {
+describe('BVT: Incidents - UI', () => {
   before(() => {
     cy.afterBlockCOO(MCP, MP); // Following cypher best practices, the cleanup is done before the test block
     cy.beforeBlockCOO(MCP, MP);
@@ -49,37 +49,53 @@ describe('Incidents', () => {
     commonPages.titleShouldHaveText('Incidents');
   });
 
-  it('renders toolbar and toggle charts button', () => {
+  it('1. Admin perspective - Incidents page - Toolbar and charts toggle functionality', () => {
+    cy.log('1.1 Verify toolbar and toggle charts button');
     incidentsPage.elements.toolbar().should('be.visible');
     incidentsPage.elements.toggleChartsButton().should('be.visible');
+    incidentsPage.elements.toggleChartsButton().click();
+    
+    cy.log('1.2 Verify charts are hidden after toggle');
+    incidentsPage.elements.incidentsChartTitle().should('not.exist');
+    incidentsPage.elements.alertsChartTitle().should('not.exist');
+    incidentsPage.elements.toggleChartsButton().click();
   });
 
-  it('sets days filter to 3 days and updates the URL', () => {
+  it('2. Admin perspective - Incidents page - Days filter functionality', () => {
+    cy.log('2.1 Set days filter to 3 days');
     incidentsPage.setDays('3 days');
+    
+    cy.log('2.2 Verify filter and URL update');
     incidentsPage.elements.daysSelect().should('contain.text', '3 days');
     cy.url().should('match', /[?&]days=3\+days/);
   });
 
-  it('toggles Critical filter and updates the URL', () => {
+  it('3. Admin perspective - Incidents page - Critical filter functionality', () => {
+    cy.log('3.1 Clear filters and toggle Critical filter');
     incidentsPage.clearAllFilters();
     incidentsPage.toggleFilter('Critical');
+    
+    cy.log('3.2 Verify URL is updated with incident filters');
     cy.url().should('match', /incidentFilters=.*Critical/);
   });
 
-  it('shows charts and alerts empty state initially', () => {
+  it('4. Admin perspective - Incidents page - Charts and alerts empty state', () => {
+    cy.log('4.1 Verify chart titles are visible');
     incidentsPage.elements.incidentsChartTitle().should('be.visible');
     incidentsPage.elements.alertsChartTitle().should('be.visible');
+    
+    cy.log('4.2 Verify alerts chart shows empty state');
     incidentsPage.elements.alertsChartEmptyState().should('exist');
   });
 
-  it('selecting an incident via chart shows alerts and adds groupId to URL', () => {
+  it('5. Admin perspective - Incidents page - Incident selection and alert details', () => {
+    cy.log('5.1 Select incident and verify alert details');
     incidentsPage.clearAllFilters();
     incidentsPage.selectIncidentByBarIndex(0);
     cy.url().should('match', /[?&]groupId=/);
     incidentsPage.elements.alertsChartSvg().find('path').should('exist');
-  });
 
-  it('shows alerts table and allows expanding a row', () => {
+    cy.log('5.2 Verify alerts table and expand first row');
     incidentsPage.elements.alertsTable().should('exist');
     incidentsPage.expandRow(0);
   });

web/cypress/fixtures/incidents/prometheus_rule_pod_crash_loop.yaml

@@ -12,7 +12,7 @@ spec:
  groups:
  - name: kubernetes-apps
    rules:
-   - alert: KubePodCrashLooping
+   - alert: {{ALERT_NAME}}
      annotations:
        description: 'Pod {{ $labels.namespace }}/{{ $labels.pod }} ({{ $labels.container
          }}) is in waiting state (reason: "CrashLoopBackOff").'

web/cypress/support/commands.ts

@@ -51,6 +51,10 @@ declare global {
     adminCLI(command: string, options?);
     login(provider?: string, username?: string, password?: string): Chainable<Element>;
     executeAndDelete(command: string);
+    waitUntilWithCustomTimeout(
+      fn: () => any,
+      options: { interval: number; timeout: number; timeoutMessage: string }
+    ): Cypress.Chainable<any>;
   }
 }
 
@@ -630,21 +634,78 @@ Cypress.Commands.add('afterBlockCOO', (MCP: { namespace: string, operatorName: s
 // Apply incident fixture manifests to the cluster
 Cypress.Commands.add('createKubePodCrashLoopingAlert', () => {
   const kubeconfigPath = Cypress.env('KUBECONFIG_PATH');
-  cy.exec(
-    `oc apply -f ./cypress/fixtures/incidents/prometheus_rule_pod_crash_loop.yaml --kubeconfig ${kubeconfigPath}`,
-  );
+  
+  // Generate a random alert name for this test run
+  const randomAlertName = `CustomPodCrashLooping_${Math.random().toString(36).substring(2, 15)}`;
+  
+  // Store the alert name globally so tests can access it
+  Cypress.env('CURRENT_ALERT_NAME', randomAlertName);
+  
+  cy.log(`Generated random alert name: ${randomAlertName}`);
+  
+  // Read the template and replace the placeholder
+  cy.readFile('./cypress/fixtures/incidents/prometheus_rule_pod_crash_loop.yaml').then((template) => {
+    const yamlContent = template.replace(/\{\{ALERT_NAME\}\}/g, randomAlertName);
+    
+    // Write the modified YAML to a temporary file
+    cy.writeFile('./cypress/fixtures/incidents/temp_prometheus_rule.yaml', yamlContent).then(() => {
+      // Apply the modified YAML
+      cy.exec(
+        `oc apply -f ./cypress/fixtures/incidents/temp_prometheus_rule.yaml --kubeconfig ${kubeconfigPath}`,
+      );
+      
+      // Clean up temporary file
+      cy.exec('rm ./cypress/fixtures/incidents/temp_prometheus_rule.yaml');
+    });
+  });
+  
   cy.exec(
     `oc apply -f ./cypress/fixtures/incidents/pod_crash_loop.yaml --kubeconfig ${kubeconfigPath}`,
   );
+  
+  // Return the alert name for the test to use
+  return cy.wrap(randomAlertName);
 });
 
 // Clean up incident fixture manifests from the cluster
-Cypress.Commands.add('cleanupIncidentsFixtures', () => {
+Cypress.Commands.add('cleanupIncidentPrometheusRules', () => {
   const kubeconfigPath = Cypress.env('KUBECONFIG_PATH');
-  cy.executeAndDelete(
-    `oc delete -f ./cypress/fixtures/incidents/pod_crash_loop.yaml --ignore-not-found=true --kubeconfig ${kubeconfigPath}`,
+  
+  // Delete all PrometheusRules that match our pattern (kubernetes-monitoring-podcrash-rules)
+  // This ensures cleanup before tests and after tests
+  cy.exec(
+    `oc delete prometheusrule kubernetes-monitoring-podcrash-rules -n openshift-monitoring --kubeconfig ${kubeconfigPath} --ignore-not-found=true`,
   );
+  
+  // Clear the environment variable if it exists
+  if (Cypress.env('CURRENT_ALERT_NAME')) {
+    Cypress.env('CURRENT_ALERT_NAME', null);
+  }
+  
   cy.executeAndDelete(
-    `oc delete -f ./cypress/fixtures/incidents/prometheus_rule_pod_crash_loop.yaml --ignore-not-found=true --kubeconfig ${kubeconfigPath}`,
+    `oc delete -f ./cypress/fixtures/incidents/pod_crash_loop.yaml --ignore-not-found=true --kubeconfig ${kubeconfigPath}`,
   );
+});
+
+// Custom waitUntil with timeout message
+Cypress.Commands.add('waitUntilWithCustomTimeout', (
+  fn: () => any,
+  options: { interval: number; timeout: number; timeoutMessage: string }
+) => {
+  const { timeoutMessage, ...waitOptions } = options;
+
+  // Set up custom error handling before the waitUntil call
+  cy.on('fail', (err) => {
+    if (err.message.includes('Timed out retrying')) {
+      // Create a new error with the custom message
+      const customError = new Error(timeoutMessage);
+      customError.stack = err.stack;
+      throw customError;
+    }
+    // For any other errors, re-throw them unchanged
+    throw err;
+  });
+
+  // Execute the waitUntil with the original options (without timeoutMessage)
+  return cy.waitUntil(fn, waitOptions);
 });

web/cypress/support/index.ts

@@ -1,8 +1,6 @@
 import './nav';
 import './selectors';
 import './commands';
-import './alert-injection';
-import './prometheus-query-mocks';
 
 export const checkErrors = () =>
   cy.window().then((win) => {

web/cypress/views/incidents-page.ts

@@ -61,19 +61,25 @@ export const incidentsPage = {
 
 
   findIncidentWithAlert: (alertName: string): Cypress.Chainable<boolean> => {
+    cy.reload();
     cy.log(`incidentsPage.findIncidentWithAlert: ${alertName}`);
+    // Bars are sometimes not loaded immidiately, this refreshes
+    // the charts and ensures the bars are loaded if present
+    incidentsPage.setDays('1 day');
+    
     return incidentsPage.elements.incidentsChartCard()
       .find('path[role="presentation"]')
       .then(($bars) => {
         const totalBars = $bars.length;
         if (totalBars <= 3) { // 3 paths are always present in the legend,
         // their parent is g without presentation label opposed ot the proper bars
-          cy.task('log', 'No bars found in incidents chart');
+          cy.log('No bars found in incidents chart');
           return cy.wrap(false);
         }
 
         const tryIndex = (index: number): Cypress.Chainable<boolean> => {
           if (index >= totalBars - 3) {
+            cy.log("Index out of bounds for bars in incidents chart");
             return cy.wrap(false);
           }
 
@@ -89,6 +95,7 @@ export const incidentsPage = {
                 return cy.wrap(true);
               }
               // Expand a row if present to surface nested details
+              // Currently expects only one row to be present
               incidentsPage.expandRow(0);
               return incidentsPage.elements.alertsTable().invoke('text').then((text2) => {
                 if (String(text2).includes(alertName)) {