Optimize cy.toolbar: remove extra iterations, ensure chainable return

Author: asirvadAbrahamVarghese

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

@@ -37,6 +37,7 @@ const textConstants = {
   resetButton: 'Reset',
 
   // Config options
+  configToolbarButton: 'Configuration',
   addScheduleConfigOption: 'Add a new Schedule',
   deleteScheduleConfigOption: 'Delete this Schedule from the Database',
   editScheduleConfigOption: 'Edit this Schedule',
@@ -105,6 +106,7 @@ const {
   startTime,
   deleteScheduleConfigOption,
   schedulesAccordionItem,
+  configToolbarButton,
   flashTypeSuccess,
   flashTypeWarning,
   flashTypeError,
@@ -120,15 +122,8 @@ const {
   browserAlertDeleteConfirmText,
 } = textConstants;
 
-function selectConfigMenu(configuration = addScheduleConfigOption) {
-  cy.get(
-    `.miq-toolbar-actions .miq-toolbar-group button[title="Configuration"]`
-  ).click();
-  return cy
-    .get(
-      `ul#overflow-menu-1__menu-body button[title="${configuration}"][role="menuitem"]`
-    )
-    .click();
+function selectConfigMenu(menuOption = addScheduleConfigOption) {
+  return cy.toolbar(configToolbarButton, menuOption);
 }
 
 function addSchedule() {

cypress/support/commands/toolbar.js

@@ -15,18 +15,22 @@ Cypress.Commands.add('toolbar', (toolbarButton, dropdownButton = '') => {
   });
 
   if (dropdownButton) {
-    cy.get('.bx--overflow-menu-options').then((dropdownButtons) => {
+    return cy.get('.bx--overflow-menu-options').then((dropdownButtons) => {
       const buttons = dropdownButtons.children();
-      const nums = [...Array(buttons.length).keys()];
-      nums.forEach((index) => {
+      for (let index = 0; index < buttons.length; index++) {
         const button = buttons[index];
-        if (button && button.innerText && button.innerText.includes(dropdownButton)) {
-          button.children[0].click();
-          return;
+        if (
+          button &&
+          button.innerText &&
+          button.innerText.includes(dropdownButton)
+        ) {
+          return cy.wrap(button.children[0]).click();
         }
-      });
+      }
+      return cy.wrap(null);
     });
   }
+  return cy.wrap(null);
 });
 
 // toolbarButton: String for the text of the toolbar button to click.