OU-1472: move test files to feature folders

web/cypress/e2e/monitoring/00.bvt_dev.cy.ts → web/cypress/e2e/alerts/alerts_bvt.cy.ts

@@ -8,7 +8,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('BVT: Monitoring - Namespaced', { tags: ['@alerting'] }, () => {
+describe('BVT: Monitoring - Namespaced', { tags: ['@alerting', '@metrics'] }, () => {
   before(() => {
     cy.beforeBlock(MP);
   });

web/cypress/e2e/virtualization/02.coo_ivt_metrics_2.cy.ts → web/cypress/e2e/alerts/alerts_ivt.cy.ts

@@ -1,6 +1,5 @@
 import { alerts } from '../../fixtures/monitoring/alert';
-import { runAllRegressionMetricsTests2 } from '../../support/monitoring/02.reg_metrics_2.cy';
-import { runAllRegressionMetricsTestsNamespace2 } from '../../support/monitoring/05.reg_metrics_namespace_2.cy';
+import { runAllRegressionAlertsTests } from '../../support/monitoring/01.reg_alerts.cy';
 import { commonPages } from '../../views/common';
 import { nav } from '../../views/nav';
 import { guidedTour } from '../../views/tour';
@@ -15,6 +14,7 @@ const MCP = {
     name: 'monitoring',
   },
 };
+
 const MP = {
   namespace: 'openshift-monitoring',
   operatorName: 'Cluster Monitoring Operator',
@@ -34,70 +34,32 @@ const KBV = {
 };
 
 describe(
-  'Installation: COO and setting up Monitoring Plugin',
-  { tags: ['@virtualization', '@slow'] },
+  'Regression: Monitoring - Alerts (Virtualization)',
+  { tags: ['@alerting', '@slow'] },
   () => {
     before(() => {
       cy.beforeBlockCOO(MCP, MP);
-    });
-
-    it('1. Installation: COO and setting up Monitoring Plugin', () => {
       cy.log('Installation: COO and setting up Monitoring Plugin');
-    });
-  },
-);
-
-describe(
-  'IVT: Monitoring UIPlugin + Virtualization',
-  { tags: ['@virtualization', '@slow'] },
-  () => {
-    before(() => {
       cy.beforeBlockVirtualization(KBV);
-    });
-
-    it('1. Virtualization perspective - Observe Menu', () => {
       cy.log('Virtualization perspective - Observe Menu and verify all submenus');
       cy.switchPerspective('Virtualization');
       guidedTour.closeKubevirtTour();
     });
-  },
-);
-
-describe('Regression: Monitoring - Metrics (Virtualization)', { tags: ['@metrics'] }, () => {
-  beforeEach(() => {
-    cy.visit('/');
-    cy.validateLogin();
-    cy.switchPerspective('Virtualization');
-    guidedTour.closeKubevirtTour();
-    alerts.getWatchdogAlert();
-    nav.sidenav.clickNavLink(['Observe', 'Metrics']);
-    commonPages.titleShouldHaveText('Metrics');
-    cy.changeNamespace('All Projects');
-    alerts.getWatchdogAlert();
-  });
-
-  runAllRegressionMetricsTests2({
-    name: 'Virtualization',
-  });
-});
-
-describe(
-  'Regression: Monitoring - Metrics Namespaced (Virtualization)',
-  { tags: ['@metrics'] },
-  () => {
     beforeEach(() => {
       cy.visit('/');
       cy.validateLogin();
       cy.switchPerspective('Virtualization');
       guidedTour.closeKubevirtTour();
-      alerts.getWatchdogAlert();
       nav.sidenav.clickNavLink(['Observe', 'Metrics']);
       commonPages.titleShouldHaveText('Metrics');
-      cy.changeNamespace(MP.namespace);
+      cy.changeNamespace('All Projects');
+      alerts.getWatchdogAlert();
+      nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+      commonPages.titleShouldHaveText('Alerting');
       alerts.getWatchdogAlert();
     });
-
-    runAllRegressionMetricsTestsNamespace2({
+    // Run tests in Virtualization perspective
+    runAllRegressionAlertsTests({
       name: 'Virtualization',
     });
   },

web/cypress/e2e/alerts/alerts_regression.cy.ts

@@ -0,0 +1,59 @@
+import { runAllRegressionAlertsTests } from '../../support/monitoring/01.reg_alerts.cy';
+import { alerts } from '../../fixtures/monitoring/alert';
+import { runAllRegressionAlertsTestsNamespace } from '../../support/monitoring/04.reg_alerts_namespace.cy';
+import { commonPages } from '../../views/common';
+import { nav } from '../../views/nav';
+
+const MP = {
+  namespace: 'openshift-monitoring',
+  operatorName: 'Cluster Monitoring Operator',
+};
+
+// Test suite for Administrator perspective
+describe(
+  'Regression: Monitoring - Alerts (Administrator)',
+  { tags: ['@alerting', '@metrics'] },
+  () => {
+    before(() => {
+      cy.beforeBlock(MP);
+    });
+
+    beforeEach(() => {
+      alerts.getWatchdogAlert();
+      nav.sidenav.clickNavLink(['Observe', 'Metrics']);
+      commonPages.titleShouldHaveText('Metrics');
+      cy.changeNamespace('All Projects');
+      nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+      commonPages.titleShouldHaveText('Alerting');
+      alerts.getWatchdogAlert();
+    });
+
+    // Run tests in Administrator perspective
+    runAllRegressionAlertsTests({
+      name: 'Administrator',
+    });
+  },
+);
+
+describe(
+  'Regression: Monitoring - Alerts Namespaced (Administrator)',
+  { tags: ['@alerting'] },
+  () => {
+    before(() => {
+      cy.beforeBlock(MP);
+    });
+
+    beforeEach(() => {
+      alerts.getWatchdogAlert();
+      nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+      commonPages.titleShouldHaveText('Alerting');
+      alerts.getWatchdogAlert();
+      cy.changeNamespace(MP.namespace);
+    });
+
+    // Run tests in Administrator perspective
+    runAllRegressionAlertsTestsNamespace({
+      name: 'Administrator',
+    });
+  },
+);

web/cypress/e2e/virtualization/00.coo_ivt.cy.ts → web/cypress/e2e/alerts/alerts_virtualization_bvt.cy.ts

@@ -3,6 +3,7 @@ import { guidedTour } from '../../views/tour';
 import { alerts } from '../../fixtures/monitoring/alert';
 import { nav } from '../../views/nav';
 import { commonPages } from '../../views/common';
+import { troubleshootingPanelPage } from 'cypress/views/troubleshooting-panel';
 
 // Set constants for the operators that need to be installed for tests.
 const MCP = {
@@ -33,39 +34,22 @@ const KBV = {
   },
 };
 
-describe(
-  'Installation: COO and setting up Monitoring Plugin',
-  { tags: ['@virtualization', '@slow'] },
-  () => {
-    before(() => {
-      cy.beforeBlockCOO(MCP, MP);
-    });
-
-    it('1. Installation: COO and setting up Monitoring Plugin', () => {
-      cy.log('Installation: COO and setting up Monitoring Plugin');
-    });
-  },
-);
-
-describe('Installation: Virtualization', { tags: ['@virtualization', '@slow'] }, () => {
+describe('IVT: Monitoring + Virtualization', { tags: ['@metrics', '@alerting', '@slow'] }, () => {
   before(() => {
+    cy.beforeBlockCOO(MCP, MP);
+    cy.log('Installation: COO and setting up Monitoring Plugin');
     cy.beforeBlockVirtualization(KBV);
-  });
-
-  it('1. Virtualization perspective - Observe Menu', () => {
     cy.log('Virtualization perspective - Observe Menu and verify all submenus');
     cy.switchPerspective('Virtualization');
     guidedTour.closeKubevirtTour();
   });
-});
-
-describe('IVT: Monitoring + Virtualization', { tags: ['@metrics', '@alerting'] }, () => {
   beforeEach(() => {
     cy.visit('/');
     guidedTour.close();
     cy.validateLogin();
     cy.switchPerspective('Virtualization');
     guidedTour.closeKubevirtTour();
+    troubleshootingPanelPage.signalCorrelationShouldNotBeVisible();
     nav.sidenav.clickNavLink(['Observe', 'Metrics']);
     commonPages.titleShouldHaveText('Metrics');
     cy.changeNamespace('All Projects');

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

@@ -2,7 +2,7 @@
 Performance walkthrough: measures rendering cost of interactive operations
 (filter toggling, time range switching, table row expansion) under load.
 
-Unlike 01.performance_benchmark which measures initial chart render time,
+Unlike performance_benchmark which measures initial chart render time,
 this test measures incremental re-render cost during a realistic user session.
 
 Verifies: OBSINTA-1006

web/cypress/e2e/monitoring/regression/03.reg_legacy_dashboards_admin.cy.ts → web/cypress/e2e/legacy-dashboards/legacy_dashboards_regression.cy.ts

@@ -1,7 +1,7 @@
-import { runAllRegressionLegacyDashboardsTests } from '../../../support/monitoring/03.reg_legacy_dashboards.cy';
-import { runAllRegressionLegacyDashboardsTestsNamespace } from '../../../support/monitoring/06.reg_legacy_dashboards_namespace.cy';
-import { commonPages } from '../../../views/common';
-import { nav } from '../../../views/nav';
+import { runAllRegressionLegacyDashboardsTests } from '../../support/monitoring/03.reg_legacy_dashboards.cy';
+import { runAllRegressionLegacyDashboardsTestsNamespace } from '../../support/monitoring/06.reg_legacy_dashboards_namespace.cy';
+import { commonPages } from '../../views/common';
+import { nav } from '../../views/nav';
 
 const MP = {
   namespace: 'openshift-monitoring',
@@ -39,7 +39,7 @@ describe(
 // Test suite for Administrator perspective
 describe(
   'Regression: Monitoring - Legacy Dashboards Namespaced (Administrator)',
-  { tags: ['@legacy-dashboards'] },
+  { tags: ['@legacy-dashboards', '@metrics'] },
   () => {
     before(() => {
       cy.beforeBlock(MP);

web/cypress/e2e/virtualization/03.coo_ivt_legacy_dashboards.cy.ts → web/cypress/e2e/legacy-dashboards/legacy_dashboards_virtualization_regression.cy.ts

@@ -33,39 +33,17 @@ const KBV = {
 };
 
 describe(
-  'Installation: COO and setting up Monitoring Plugin',
-  { tags: ['@virtualization', '@slow'] },
+  'Regression: Monitoring - Legacy Dashboards (Virtualization)',
+  { tags: ['@legacy-dashboards', '@slow'] },
   () => {
     before(() => {
       cy.beforeBlockCOO(MCP, MP);
-    });
-
-    it('1. Installation: COO and setting up Monitoring Plugin', () => {
       cy.log('Installation: COO and setting up Monitoring Plugin');
-    });
-  },
-);
-
-describe(
-  'IVT: Monitoring UIPlugin + Virtualization',
-  { tags: ['@virtualization', '@slow'] },
-  () => {
-    before(() => {
       cy.beforeBlockVirtualization(KBV);
-    });
-
-    it('1. Virtualization perspective - Observe Menu', () => {
       cy.log('Virtualization perspective - Observe Menu and verify all submenus');
       cy.switchPerspective('Virtualization');
       guidedTour.closeKubevirtTour();
     });
-  },
-);
-
-describe(
-  'Regression: Monitoring - Legacy Dashboards (Virtualization)',
-  { tags: ['@legacy-dashboards'] },
-  () => {
     beforeEach(() => {
       cy.visit('/');
       cy.validateLogin();