perses post coo140

Author: etmurasaki

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

@@ -1,6 +1,6 @@
 import { nav } from '../../views/nav';
-import { runBVTCOOPersesTests } from '../../support/perses/00.coo_bvt_perses_admin.cy';
-import { guidedTour } from '../../views/tour';
+//TODO: rename after customizable-dashboards gets merged
+import { runBVTCOOPersesTests1 } from '../../support/perses/00.coo_bvt_perses_admin.cy';
 
 // Set constants for the operators that need to be installed for tests.
 const MCP = {
@@ -18,17 +18,20 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
+//TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
 describe('BVT: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke', '@dashboards', '@perses'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
   });
 
   beforeEach(() => {
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 
-  runBVTCOOPersesTests({
+  //TODO: rename after customizable-dashboards gets merged
+  runBVTCOOPersesTests1({
     name: 'Administrator',
   });
 

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

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @dashboards when customizable-dashboards gets merged
-describe('COO - Dashboards (Perses) - List perses dashboards', { tags: ['@perses', '@dashboards-'] }, () => {
+describe('COO - Dashboards (Perses) - List perses dashboards', { tags: ['@perses', '@dashboards'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

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

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @dashboards when customizable-dashboards gets merged
-describe('COO - Dashboards (Perses) - Edit perses dashboard', { tags: ['@perses', '@dashboards-'] }, () => {
+describe('COO - Dashboards (Perses) - Edit perses dashboard', { tags: ['@perses', '@dashboards'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

web/cypress/e2e/perses/02.coo_edit_perses_admin.cy.ts

@@ -18,7 +18,7 @@ const MP = {
 };
 
 //TODO: change tag to @dashboards when customizable-dashboards gets merged
-describe('COO - Dashboards (Perses) - Create perses dashboard', { tags: ['@perses', '@dashboards-'] }, () => {
+describe('COO - Dashboards (Perses) - Create perses dashboard', { tags: ['@perses', '@dashboards'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

web/cypress/e2e/perses/03.coo_create_perses_admin.cy.ts

@@ -18,7 +18,7 @@ const MP = {
 };
 
 //TODO: change tag to @dashboards when customizable-dashboards gets merged
-describe('COO - Dashboards (Perses) - Import perses dashboard', { tags: ['@perses', '@dashboards-'] }, () => {
+describe('COO - Dashboards (Perses) - Import perses dashboard', { tags: ['@perses', '@dashboards'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

web/cypress/e2e/perses/04.coo_import_perses_admin.cy.ts

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
-describe('RBAC User1: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses-dev'] }, () => {
+describe('RBAC User1: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@perses','@perses-dev'] }, () => {
 
   before(() => {
     //TODO: https://issues.redhat.com/browse/OCPBUGS-58468 - when it gets fixed, installation can be don using non-admin user

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

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
-describe('RBAC User2: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses-dev'] }, () => {
+describe('RBAC User2: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@perses','@perses-dev'] }, () => {
 
   before(() => {
     //TODO: https://issues.redhat.com/browse/OCPBUGS-58468 - when it gets fixed, installation can be don using non-admin user

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

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
-describe('RBAC User3: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses-dev'] }, () => {
+describe('RBAC User3: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@perses','@perses-dev'] }, () => {
 
   before(() => {
     //TODO: https://issues.redhat.com/browse/OCPBUGS-58468 - when it gets fixed, installation can be don using non-admin user

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

@@ -19,7 +19,7 @@ const MP = {
 };
 
 //TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
-describe('RBAC User4: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses-dev'] }, () => {
+describe('RBAC User4: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@perses','@perses-dev'] }, () => {
 
   before(() => {
     //TODO: https://issues.redhat.com/browse/OCPBUGS-58468 - when it gets fixed, installation can be don using non-admin user