Merge pull request #794 from etmurasaki/etmura-OU-1162

OU-1162: perses automation testing - import dashboard and rbac

Author: openshift-merge-bot[bot]

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

@@ -1,7 +1,6 @@
 import { nav } from '../../views/nav';
 //TODO: rename after customizable-dashboards gets merged
 import { runBVTCOOPersesTests1 } from '../../support/perses/00.coo_bvt_perses_admin_1.cy';
-import { guidedTour } from '../../views/tour';
 
 // Set constants for the operators that need to be installed for tests.
 const MCP = {
@@ -24,6 +23,7 @@ describe('BVT: COO - Dashboards (Perses) - Administrator perspective', { tags: [
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
   });
 
   beforeEach(() => {

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

@@ -23,6 +23,7 @@ describe('COO - Dashboards (Perses) - List perses dashboards', { tags: ['@perses
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
   });
 
   beforeEach(() => {
@@ -46,6 +47,7 @@ describe('COO - Dashboards (Perses) - List perses dashboards - Namespace', { tag
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
   });
 
   beforeEach(() => {

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

@@ -23,6 +23,7 @@ describe('COO - Dashboards (Perses) - Edit perses dashboard', { tags: ['@perses'
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
   });
 
   beforeEach(() => {

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

@@ -22,6 +22,7 @@ describe('COO - Dashboards (Perses) - Create perses dashboard', { tags: ['@perse
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
     cy.setupPersesRBACandExtraDashboards();
   });
 

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

@@ -0,0 +1,46 @@
+import { nav } from '../../views/nav';
+import { runCOOImportPersesTests } from '../../support/perses/04.coo_import_perses_admin.cy';
+
+// Set constants for the operators that need to be installed for tests.
+const MCP = {
+  namespace: 'openshift-cluster-observability-operator',
+  packageName: 'cluster-observability-operator',
+  operatorName: 'Cluster Observability Operator',
+  config: {
+    kind: 'UIPlugin',
+    name: 'monitoring',
+  },
+};
+
+const MP = {
+  namespace: 'openshift-monitoring',
+  operatorName: 'Cluster Monitoring Operator',
+};
+
+//TODO: change tag to @dashboards when customizable-dashboards gets merged
+describe('COO - Dashboards (Perses) - Import perses dashboard', { tags: ['@perses', '@dashboards-'] }, () => {
+
+  before(() => {
+    cy.beforeBlockCOO(MCP, MP);
+    cy.cleanupPersesTestDashboardsBeforeTests();
+    cy.setupPersesRBACandExtraDashboards();
+  });
+
+  beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
+    cy.wait(5000);
+    cy.changeNamespace('All Projects');
+  });
+
+  after(() => {
+    cy.cleanupExtraDashboards();
+  });
+
+  runCOOImportPersesTests({ 
+    name: 'Administrator',
+  });
+
+});
+
+
+