Skip to content

Commit 0cd40de

Browse files
committed
fixes for coo140
1 parent 6ac0454 commit 0cd40de

19 files changed

Lines changed: 62 additions & 59 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const MP = {
1919
};
2020

2121
//TODO: change tag to @smoke, @dashboards, @perses when customizable-dashboards gets merged
22-
describe('BVT: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses-'] }, () => {
22+
describe('BVT: COO - Dashboards (Perses) - Administrator perspective', { tags: ['@smoke-', '@dashboards-', '@perses'] }, () => {
2323

2424
before(() => {
2525
cy.beforeBlockCOO(MCP, MP);

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

0 commit comments

Comments
 (0)