Merge pull request #9617 from asirvadAbrahamVarghese/enhance-accordion-command

Enhance accordion command

Author: jrafanie

cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js

@@ -10,7 +10,6 @@ const APP_SETTINGS_MENU_OPTION = 'Application Settings';
 
 // List items
 const DIAGNOSTICS_ACCORDION_ITEM = 'Diagnostics';
-const DIAGNOSTICS_ACCORDION_ITEM_ID = 'diagnostics_accord';
 const MANAGEIQ_REGION_ACCORDION_ITEM = /^ManageIQ Region:/;
 const ZONE_ACCORDION_ITEM = /^Zone:/;
 const SERVER_ACCORDION_ITEM = /^Server:/;
@@ -174,11 +173,8 @@ describe('Automate Collect logs Edit form operations', () => {
     cy.login();
     // Navigate to Application settings and expand Diagnostics accordion
     cy.menu(SETTINGS_MENU_OPTION, APP_SETTINGS_MENU_OPTION);
-    cy.interceptApi({
-      alias: 'getDiagnosticsInfo',
-      urlPattern: `/ops/accordion_select?id=${DIAGNOSTICS_ACCORDION_ITEM_ID}`,
-      triggerFn: () => cy.accordion(DIAGNOSTICS_ACCORDION_ITEM),
-    });
+    // Expand Diagnostics accordion
+    cy.accordion(DIAGNOSTICS_ACCORDION_ITEM);
   });
 
   describe('Settings > Application Settings > Diagnostics > Manage IQ Region > Zone > Server > Collect logs > Edit', () => {

cypress/e2e/ui/validate-intercept-api-command.cy.js

@@ -19,12 +19,8 @@ describe('Validate intercept command', () => {
   });
 
   it('Should register multiple unique aliases', () => {
-    // first api with alias 'accordionSelectApi'
-    cy.interceptApi({
-      alias: 'accordionSelectApi',
-      urlPattern: /\/ops\/accordion_select\?id=.*/,
-      triggerFn: () => cy.accordion('Diagnostics'),
-    });
+    // first api with alias 'accordionSelectApi'(Accordion select api wait is handled from cy.accordion command with alias 'accordionSelectApi')
+    cy.accordion('Diagnostics');
     // second api with alias 'treeSelectApi'(Tree select api wait is handled from selectAccordionItem with alias 'treeSelectApi')
     cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]);
     // verifies that both the aliases are set and the request is intercepted & awaited
@@ -37,31 +33,21 @@ describe('Validate intercept command', () => {
   });
 
   it('Should not register duplicate alias', () => {
-    // add first api with alias 'accordionSelectApi'
-    cy.interceptApi({
-      alias: 'accordionSelectApi',
-      urlPattern: /\/ops\/accordion_select\?id=.*/,
-      triggerFn: () => cy.accordion('Diagnostics'),
-    }).then(() => {
-      cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
-        expect(Object.keys(interceptedAliasesObject).length).to.equal(1);
-      });
+    // first api with alias 'accordionSelectApi'(Accordion select api wait is handled from cy.accordion command with alias 'accordionSelectApi')
+    cy.accordion('Diagnostics');
+    cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
+      expect(Object.keys(interceptedAliasesObject).length).to.equal(1);
     });
     // second api with alias 'treeSelectApi'(Tree select api wait is handled from selectAccordionItem with alias 'treeSelectApi')
     cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]);
     cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
       expect(Object.keys(interceptedAliasesObject).length).to.equal(2);
     });
-    // third api with a duplicate alias as above 'accordionSelectApi'
-    cy.interceptApi({
-      alias: 'accordionSelectApi',
-      urlPattern: /\/ops\/accordion_select\?id=.*/,
-      triggerFn: () => cy.accordion('Access Control'),
-    }).then(() => {
-      // assert that the alias is not overwritten
-      cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
-        expect(Object.keys(interceptedAliasesObject).length).to.equal(2);
-      });
+    // third api with a duplicate alias as above 'accordionSelectApi'(Accordion select api wait is handled from cy.accordion command with alias 'accordionSelectApi')
+    cy.accordion('Access Control');
+    // assert that the alias is not overwritten
+    cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
+      expect(Object.keys(interceptedAliasesObject).length).to.equal(2);
     });
   });
 });

cypress/support/commands/explorer.js

@@ -10,11 +10,13 @@ Cypress.Commands.add('accordion', (title) => {
   ret.then((el) => {
     // Do not collapse if already expanded
     if (el.is('.collapsed')) {
-      cy.wrap(el).click();
+      cy.interceptApi({
+        alias: 'accordionSelectApi',
+        urlPattern: /\/[^\/]+\/accordion_select\?id=.*/,
+        triggerFn: () => cy.wrap(el).click(),
+      });
     }
   });
-
-  return ret.parents('.panel');
 });
 
 // name: String of the record in the accordion panel to click.