Skip to content

Commit 6c91df7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #771 from etmurasaki/etmura-OU-1231
OU-1231: customizable dashboards automation testing fixes after merge to main
2 parents 98b4302 + 9f23f93 commit 6c91df7

4 files changed

Lines changed: 40 additions & 75 deletions

File tree

‎web/cypress/support/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ Cypress.on('uncaught:exception', (err) => {
2828
message.includes('Bad Gateway') ||
2929
message.includes(`Cannot read properties of null (reading 'default')`) ||
3030
message.includes(`(intermediate value) is not a function`) ||
31-
//TODO: OU-1158
32-
message.includes(`[ Federation Runtime ]: Failed to load script resources. #RUNTIME-008`)
31+
message.includes(`Cannot read properties of null (reading '0')`)
3332
) {
3433
console.warn('Ignored frontend exception:', err.message);
3534
return false;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ export function testBVTCOOPerses1(perspective: PerspectiveConfig) {
6767
listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[0]);
6868
persesDashboardsPage.downloadDashboard(true, persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'JSON');
6969
persesDashboardsPage.downloadDashboard(true, persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'YAML');
70-
persesDashboardsPage.downloadDashboard(true, persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'YAML (CR)');
70+
persesDashboardsPage.downloadDashboard(true, persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'YAML (CR v1alpha1)');
71+
persesDashboardsPage.downloadDashboard(true, persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'YAML (CR v1alpha2)');
7172
persesDashboardsPage.viewJSON(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[2], 'openshift-cluster-observability-operator');
7273

7374
});

‎web/cypress/support/perses/02.coo_edit_perses_admin_1.cy.ts‎

Lines changed: 32 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -145,93 +145,56 @@ export function testCOOEditPerses1(perspective: PerspectiveConfig) {
145145
persesDashboardsPage.assertDuplicatedPanel('Legend Example', 2);
146146

147147
});
148-
149-
it(`14.${perspective.name} perspective - Edit Toolbar - Add Panel - Required field validation`, () => {
150-
cy.log(`14.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
151-
commonPages.titleShouldHaveText('Dashboards');
152-
listPersesDashboardsPage.shouldBeLoaded();
153-
154-
cy.log(`14.2. Filter by Name`);
155-
listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownPersesDev.PERSES_DASHBOARD_SAMPLE[0]);
156-
listPersesDashboardsPage.countDashboards('1');
157-
158-
cy.log(`14.3. Click on a dashboard`);
159-
listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownPersesDev.PERSES_DASHBOARD_SAMPLE[0]);
160-
161-
cy.log(`14.4. Click on Edit button`);
162-
cy.wait(2000);
163-
persesDashboardsPage.clickEditButton();
164-
165-
cy.log(`14.5. Click on Add Panel Group button`);
166-
persesDashboardsPage.clickEditActionButton('AddGroup');
167-
persesDashboardsPanelGroup.addPanelGroup('PanelGroup Required Field Validation', 'Open', '');
168-
169-
cy.log(`14.6. Click on Add Panel button`);
170-
persesDashboardsPanelGroup.clickPanelGroupAction('PanelGroup Required Field Validation', 'addPanel');
171-
172-
cy.get('input[name="'+editPersesDashboardsAddPanel.inputName+'"]').clear().type('Required Field Validation');
173-
174-
persesDashboardsPanel.clickDropdownAndSelectOption('Type', persesDashboardsAddListPanelType.BAR_CHART);
175-
cy.get('input[name="'+editPersesDashboardsAddPanel.inputName+'"]').clear().type('Required Field Validation');
176-
persesDashboardsPanel.clickDropdownAndSelectOption('Type', persesDashboardsAddListPanelType.BAR_CHART);
177-
cy.get('input[name="'+editPersesDashboardsAddPanel.inputName+'"]').clear();
178-
cy.get('#'+IDs.persesDashboardAddPanelForm).parent('div').find('h2').siblings('div').find('button').contains('Add').should('be.visible').click();
179-
180-
cy.log(`14.7. Assert required field validation`);
181-
persesDashboardsPanel.assertRequiredFieldValidation('Name');
182-
persesDashboardsPanel.clickButton('Cancel');
183-
persesDashboardsPage.clickEditActionButton('Cancel');
184-
});
185148

186-
it(`15.${perspective.name} perspective - Edit Toolbar - Perform changes and Cancel`, () => {
187-
cy.log(`15.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
149+
it(`14.${perspective.name} perspective - Edit Toolbar - Perform changes and Cancel`, () => {
150+
cy.log(`14.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
188151
commonPages.titleShouldHaveText('Dashboards');
189152
listPersesDashboardsPage.shouldBeLoaded();
190153

191-
cy.log(`15.2. Filter by Name`);
154+
cy.log(`14.2. Filter by Name`);
192155
listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownCOO.K8S_COMPUTE_RESOURCES_CLUSTER[0]);
193156
listPersesDashboardsPage.countDashboards('1');
194157

195-
cy.log(`15.3. Click on a dashboard`);
158+
cy.log(`14.3. Click on a dashboard`);
196159
listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownCOO.K8S_COMPUTE_RESOURCES_CLUSTER[0]);
197160
//TODO: change back to shouldBeLoaded when customizable-dashboards gets merged
198161
// persesDashboardsPage.shouldBeLoaded1();
199162

200-
cy.log(`15.4. Click on Edit button`);
163+
cy.log(`14.4. Click on Edit button`);
201164
cy.wait(2000);
202165
persesDashboardsPage.clickEditButton();
203166
persesDashboardsPage.clickEditActionButton('EditVariables');
204167
persesDashboardsEditVariables.clickButton('Add Variable');
205168
//https://issues.redhat.com/browse/OU-1159 - Custom All Value is not working
206169
persesDashboardsEditVariables.addListVariable('ListVariable', true, true, 'AAA', 'Test', 'Test', undefined, undefined);
207170

208-
cy.log(`15.5. Add variable`);
171+
cy.log(`14.5. Add variable`);
209172
persesDashboardsEditVariables.clickButton('Add');
210173

211-
cy.log(`15.6. Apply changes`);
174+
cy.log(`14.6. Apply changes`);
212175
persesDashboardsEditVariables.clickButton('Apply');
213176

214-
cy.log(`15.7. Assert Variable before cancelling`);
177+
cy.log(`14.7. Assert Variable before cancelling`);
215178
persesDashboardsPage.searchAndSelectVariable('ListVariable', 'All');
216179

217-
cy.log(`15.8. Click on Add Panel Group button`);
180+
cy.log(`14.8. Click on Add Panel Group button`);
218181
persesDashboardsPage.clickEditActionButton('AddGroup');
219182
persesDashboardsPanelGroup.addPanelGroup('PanelGroup Perform Changes and Cancel', 'Open', '');
220183

221-
cy.log(`15.9. Click on Add Panel button`);
184+
cy.log(`14.9. Click on Add Panel button`);
222185
persesDashboardsPanelGroup.clickPanelGroupAction('PanelGroup Perform Changes and Cancel', 'addPanel');
223186
persesDashboardsPanel.addPanel('Panel Perform Changes and Cancel', 'PanelGroup Perform Changes and Cancel', 'Bar Chart');
224187

225-
cy.log(`15.10. Click on Cancel button`);
188+
cy.log(`14.10. Click on Cancel button`);
226189
persesDashboardsPage.clickEditActionButton('Cancel');
227190

228-
cy.log(`15.11. Assert variable not exist`);
191+
cy.log(`14.11. Assert variable not exist`);
229192
persesDashboardsPage.assertVariableNotExist('ListVariable');
230193

231-
cy.log(`15.12. Assert panel group not exist`);
194+
cy.log(`14.12. Assert panel group not exist`);
232195
persesDashboardsPage.assertPanelGroupNotExist('PanelGroup Perform Changes and Cancel');
233196

234-
cy.log(`15.13. Assert panel not exist`);
197+
cy.log(`14.13. Assert panel not exist`);
235198
persesDashboardsPage.assertPanelNotExist('Panel Perform Changes and Cancel');
236199

237200
});
@@ -242,72 +205,72 @@ export function testCOOEditPerses1(perspective: PerspectiveConfig) {
242205
* Admin user and dev users with persesdashboard-editor-role will be able to edit dashboards using CRD.
243206
*
244207
*/
245-
it(`16.${perspective.name} perspective - Try to editAccelerators and APM dashboards`, () => {
246-
cy.log(`16.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
208+
it(`15.${perspective.name} perspective - Try to editAccelerators and APM dashboards`, () => {
209+
cy.log(`15.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
247210
commonPages.titleShouldHaveText('Dashboards');
248211
listPersesDashboardsPage.shouldBeLoaded();
249212

250-
cy.log(`16.2. Filter by Name`);
213+
cy.log(`15.2. Filter by Name`);
251214
listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[0]);
252215
listPersesDashboardsPage.countDashboards('1');
253216

254-
cy.log(`16.3. Click on a dashboard`);
217+
cy.log(`15.3. Click on a dashboard`);
255218
listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[0]);
256219
//TODO: change back to shouldBeLoaded when customizable-dashboards gets merged
257220
// persesDashboardsPage.shouldBeLoaded1();
258221

259-
cy.log(`16.4. Click on Edit button`);
222+
cy.log(`15.4. Click on Edit button`);
260223
cy.wait(2000);
261224
persesDashboardsPage.clickEditButton();
262225
persesDashboardsPage.clickEditActionButton('EditVariables');
263226
persesDashboardsEditVariables.clickButton('Add Variable');
264227
//https://issues.redhat.com/browse/OU-1159 - Custom All Value is not working
265228
persesDashboardsEditVariables.addListVariable('ListVariable', true, true, 'AAA', 'Test', 'Test', undefined, undefined);
266229

267-
cy.log(`16.5. Add variable`);
230+
cy.log(`15.5. Add variable`);
268231
persesDashboardsEditVariables.clickButton('Add');
269232

270-
cy.log(`16.6. Apply changes`);
233+
cy.log(`15.6. Apply changes`);
271234
persesDashboardsEditVariables.clickButton('Apply');
272235

273-
cy.log(`16.7. Assert Variable before saving`);
236+
cy.log(`15.7. Assert Variable before saving`);
274237
persesDashboardsPage.searchAndSelectVariable('ListVariable', 'All');
275238

276-
cy.log(`16.8. Click on Add Panel Group button`);
239+
cy.log(`15.8. Click on Add Panel Group button`);
277240
persesDashboardsPage.clickEditActionButton('AddGroup');
278241
persesDashboardsPanelGroup.addPanelGroup('PanelGroup Perform Changes and Save', 'Open', '');
279242

280-
cy.log(`16.9. Click on Add Panel button`);
243+
cy.log(`15.9. Click on Add Panel button`);
281244
persesDashboardsPanelGroup.clickPanelGroupAction('PanelGroup Perform Changes and Save', 'addPanel');
282245
persesDashboardsPanel.addPanel('Panel Perform Changes and Save', 'PanelGroup Perform Changes and Save', 'Bar Chart');
283246

284-
cy.log(`16.10. Click on Save button`);
247+
cy.log(`15.10. Click on Save button`);
285248
persesDashboardsPage.clickEditActionButton('Save');
286249

287-
cy.log(`16.11. Back and check panel group`);
250+
cy.log(`15.11. Back and check panel group`);
288251
persesDashboardsPage.backToListPersesDashboardsPage();
289252
listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[0]);
290253
listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownCOO.ACCELERATORS_COMMON_METRICS[0]);
291254

292-
cy.log(`16.12. Assert Variable before deleting`);
255+
cy.log(`15.12. Assert Variable before deleting`);
293256
persesDashboardsPage.searchAndSelectVariable('ListVariable', 'All');
294257

295-
cy.log(`16.13. Assert panel group exists`);
258+
cy.log(`15.13. Assert panel group exists`);
296259
persesDashboardsPage.panelGroupHeaderAssertion('PanelGroup Perform Changes and Save', 'Open');
297260

298-
cy.log(`16.14. Assert panel exists`);
261+
cy.log(`15.14. Assert panel exists`);
299262
persesDashboardsPage.assertPanel('Panel Perform Changes and Save', 'PanelGroup Perform Changes and Save', 'Open');
300263

301-
cy.log (`16.15. Click on Edit button`);
264+
cy.log (`15.15. Click on Edit button`);
302265
persesDashboardsPage.clickEditButton();
303266

304-
cy.log(`16.16. Delete variable`);
267+
cy.log(`15.16. Delete variable`);
305268
persesDashboardsPage.clickEditActionButton('EditVariables');
306269
persesDashboardsEditVariables.clickDeleteVariableButton(1);
307270
persesDashboardsEditVariables.clickButton('Apply');
308271
persesDashboardsPage.assertVariableNotExist('ListVariable');
309272

310-
cy.log(`16.17. Delete panel group`);
273+
cy.log(`15.17. Delete panel group`);
311274
persesDashboardsPanelGroup.clickPanelGroupAction('PanelGroup Perform Changes and Save', 'delete');
312275
persesDashboardsPanelGroup.clickDeletePanelGroupButton();
313276
persesDashboardsPage.clickEditActionButton('Save');

‎web/cypress/views/perses-dashboards.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export const persesDashboardsPage = {
397397
cy.byDataTestID(persesMUIDataTestIDs.panelHeader).find('h6').contains(name).should('not.exist');
398398
},
399399

400-
downloadDashboard: (clearFolder: boolean, dashboardName: string, format: 'JSON' | 'YAML' | 'YAML (CR)') => {
400+
downloadDashboard: (clearFolder: boolean, dashboardName: string, format: 'JSON' | 'YAML' | 'YAML (CR v1alpha1)' | 'YAML (CR v1alpha2)') => {
401401
cy.log('persesDashboardsPage.downloadDashboard');
402402

403403
if (clearFolder) {
@@ -408,8 +408,10 @@ export const persesDashboardsPage = {
408408
cy.byPFRole('menuitem').contains(format).should('be.visible').click({ force: true });
409409
cy.wait(1000);
410410
let filename: string;
411-
if (format === 'YAML (CR)') {
412-
filename = dashboardName + '-cr' + '.yaml';
411+
if (format === 'YAML (CR v1alpha1)') {
412+
filename = dashboardName + '-cr-v1alpha1' + '.yaml';
413+
} else if (format === 'YAML (CR v1alpha2)') {
414+
filename = dashboardName + '-cr-v1alpha2' + '.yaml';
413415
} else {
414416
filename = dashboardName + '.' + format.toLowerCase();
415417
}

0 commit comments

Comments
 (0)