Skip to content

Commit 337dbdc

Browse files
etmurasakietmurasaki
committed
fixes for coo140
1 parent 6ac0454 commit 337dbdc

16 files changed

Lines changed: 55 additions & 51 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User1: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
});
6869

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User2: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
cy.changeNamespace('All Projects');
6869
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User3: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
});
6869

‎web/cypress/e2e/perses/99.coo_rbac_perses_user4.cy.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User4: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
});
6869

‎web/cypress/e2e/perses/99.coo_rbac_perses_user5.cy.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User5: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
});
6869

‎web/cypress/e2e/perses/99.coo_rbac_perses_user6.cy.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ describe('RBAC User6: COO - Dashboards (Perses) - Administrator perspective', {
6363
});
6464

6565
beforeEach(() => {
66+
nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
6667
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
6768
});
6869

‎web/cypress/fixtures/coo/coo141_perses/import/acm-vm-status.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,10 @@
521521
"schemaVersion": 30,
522522
"style": "dark",
523523
"tags": [
524-
"ACM",
525-
"KubeVirt",
526-
"OpenShift",
527-
"Virtualization"
524+
"acm",
525+
"kubevirt",
526+
"openshift",
527+
"virtualization"
528528
],
529529
"templating": {
530530
"list": [

‎web/cypress/fixtures/perses/constants.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,11 @@ export const persesDashboardsAddPanelAddQueryType ={
139139
}
140140

141141
export const persesCreateDashboard = {
142-
DIALOG_MAX_LENGTH_VALIDATION: 'Danger alert:bad request: code=400, message=cannot contain more than 75 characters, internal=cannot contain more than 75 characters',
142+
DIALOG_MAX_LENGTH_VALIDATION: 'Must be 75 or fewer characters long: error status;',
143143
DIALOG_DUPLICATED_NAME_PF_VALIDATION_PREFIX: 'Dashboard name ',
144-
DIALOG_DUPLICATED_NAME_PF_VALIDATION_SUFFIX: ' already exists in this project: error status;',
145-
DIALOG_DUPLICATED_NAME_BKD_VALIDATION: 'Danger alert:document already exists',
144+
DIALOG_DUPLICATED_NAME_PF_VALIDATION_SUFFIX: ' already exists in ',
145+
DIALOG_DUPLICATED_NAME_PF_VALIDATION_SUFFIX_PROJECT: ' project!: error status;',
146+
DIALOG_DUPLICATED_NAME_BKD_VALIDATION: 'Danger alert:Could not create dashboard. e: document already exists',
146147
}
147148

148149
export const persesDashboardsEmptyDashboard = {
@@ -170,6 +171,6 @@ export const persesDashboardsImportDashboard = {
170171
DIALOG_UNABLE_TO_DETECT_DASHBOARD_FORMAT: 'Unable to detect dashboard format. Please provide a valid Perses or Grafana dashboard.',
171172
DIALOG_GRAFANA_DASHBOARD_DETECTED: 'Grafana dashboard detected. It will be automatically migrated to Perses format. Note: migration may be partial as not all Grafana features are supported.',
172173
DIALOG_PERSES_DASHBOARD_DETECTED: 'Perses dashboard detected.',
173-
DIALOG_FAILED_TO_MIGRATE_GRAFANA_DASHBOARD: 'Danger alert:Failed to migrate dashboard: internal server error',
174-
DIALOG_DUPLICATED_DASHBOARD_ERROR: 'Danger alert:document already exists',
174+
DIALOG_FAILED_TO_MIGRATE_GRAFANA_DASHBOARD: 'Danger alert:Error migrating dashboard: Failed to migrate dashboard: internal server error',
175+
DIALOG_DUPLICATED_DASHBOARD_ERROR: 'Danger alert:Error importing dashboard: document already exists',
175176
}

‎web/cypress/support/perses/00.coo_bvt_perses_admin_1.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function testBVTCOOPerses1(perspective: PerspectiveConfig) {
106106

107107
cy.log(`5.5. Click on the Kebab icon - Delete`);
108108
nav.sidenav.clickNavLink(['Observe', 'Alerting']);
109-
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);s
109+
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
110110
listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownPersesDev.PERSES_DASHBOARD_SAMPLE[0] + ' - Renamed');
111111
listPersesDashboardsPage.countDashboards('1');
112112

‎web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
198198
listPersesDashboardsPage.assertCreateButtonIsEnabled();
199199
listPersesDashboardsPage.clickCreateButton();
200200
persesCreateDashboardsPage.createDashboardShouldBeLoaded();
201-
persesCreateDashboardsPage.assertProjectDropdown('openshift-cluster-observability-operator');
202201
persesCreateDashboardsPage.assertProjectNotExistsInDropdown('observ-test');
203202
persesCreateDashboardsPage.assertProjectNotExistsInDropdown('perses-dev');
204203
persesCreateDashboardsPage.assertProjectNotExistsInDropdown('openshift-monitoring');
205204
persesCreateDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace3');
206205
persesCreateDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace4');
206+
persesCreateDashboardsPage.assertProjectDropdown('openshift-cluster-observability-operator');
207207
persesCreateDashboardsPage.createDashboardDialogCancelButton();
208208

209209
cy.log(`4.4 change namespace to openshift-cluster-observability-operator`);
@@ -436,12 +436,12 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
436436
listPersesDashboardsPage.clickDuplicateOption();
437437

438438
cy.log(`8.5. Assert project dropdown options`);
439-
listPersesDashboardsPage.assertDuplicateProjectDropdownExists('openshift-cluster-observability-operator');
440439
listPersesDashboardsPage.assertDuplicateProjectDropdownNotExists('observ-test');
441440
listPersesDashboardsPage.assertDuplicateProjectDropdownNotExists('perses-dev');
442441
listPersesDashboardsPage.assertDuplicateProjectDropdownNotExists('empty-namespace3');
443442
listPersesDashboardsPage.assertDuplicateProjectDropdownNotExists('empty-namespace4');
444443
listPersesDashboardsPage.assertDuplicateProjectDropdownNotExists('openshift-monitoring');
444+
listPersesDashboardsPage.assertDuplicateProjectDropdownExists('openshift-cluster-observability-operator');
445445

446446
cy.log(`8.6. Enter new dashboard name`);
447447
listPersesDashboardsPage.duplicateDashboardEnterName(dashboardName);
@@ -459,7 +459,6 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
459459
listPersesDashboardsPage.clickKebabIcon();
460460
listPersesDashboardsPage.clickDeleteOption();
461461
listPersesDashboardsPage.deleteDashboardDeleteButton();
462-
persesDashboardsPage.closeSuccessAlert();
463462
listPersesDashboardsPage.emptyState();
464463
listPersesDashboardsPage.countDashboards('0');
465464
nav.sidenav.clickNavLink(['Observe', 'Alerting']);
@@ -477,21 +476,20 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
477476
cy.log(`9.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
478477
listPersesDashboardsPage.shouldBeLoaded();
479478

480-
cy.log(`9.3. Filter by Name`);
479+
cy.log(`9.2. Filter by Name`);
481480
listPersesDashboardsPage.filter.byName('Testing Dashboard - UP');
482481
listPersesDashboardsPage.countDashboards('1');
483482

484-
cy.log(`9.4. Click on the Kebab icon - Delete`);
483+
cy.log(`9.3. Click on the Kebab icon - Delete`);
485484
listPersesDashboardsPage.clickKebabIcon();
486485
listPersesDashboardsPage.clickDeleteOption();
487486
listPersesDashboardsPage.deleteDashboardDeleteButton();
488-
persesDashboardsPage.closeSuccessAlert();
489487
listPersesDashboardsPage.emptyState();
490488
listPersesDashboardsPage.countDashboards('0');
491489
nav.sidenav.clickNavLink(['Observe', 'Alerting']);
492490
nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
493491

494-
cy.log(`9.5. Filter by Name`);
492+
cy.log(`9.4. Filter by Name`);
495493
listPersesDashboardsPage.filter.byName('Testing Dashboard - UP');
496494
listPersesDashboardsPage.countDashboards('0');
497495
nav.sidenav.clickNavLink(['Observe', 'Alerting']);
@@ -514,12 +512,12 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
514512
persesImportDashboardsPage.assertPersesDashboardDetected();
515513

516514
cy.log(`10.4. Verify project dropdown options`);
517-
persesImportDashboardsPage.assertProjectDropdown('openshift-cluster-observability-operator');
518515
persesImportDashboardsPage.assertProjectNotExistsInDropdown('observ-test');
519516
persesImportDashboardsPage.assertProjectNotExistsInDropdown('perses-dev');
520517
persesImportDashboardsPage.assertProjectNotExistsInDropdown('openshift-monitoring');
521518
persesImportDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace3');
522519
persesImportDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace4');
520+
persesImportDashboardsPage.assertProjectDropdown('openshift-cluster-observability-operator');
523521
persesImportDashboardsPage.clickCancelButton();
524522

525523
cy.log(`10.5 change namespace to openshift-cluster-observability-operator`);

0 commit comments

Comments
 (0)