@globisnv/cypress-core 2.1.0 → 2.1.1

package/dist/commands/GLO_commands.d.ts

@@ -207,16 +207,16 @@ declare global {
             /**
              * Command to open the workflow menu and to click a desired workflow in the main program datacontrol section.
              *
-             * @param {string} buttonName - The workflow entry to be selected.
-             * @param {exactMatchFlag} [exactMatch] - Indicates whether to search for an exact match (equalBool) or not. Default is disabled.
+             * @param {string} buttonName - The workflow entry to be selected. An entry with exactly this text is preferred over entries that only contain it.
+             * @param {exactMatchFlag} [exactMatch] - Only accept an exact match (equalBool). Default: disabled, falls back to the first entry containing the text when no entry matches exactly.
              */
             GLO_selectMenuButton(buttonName: string, exactMatch?: exactMatchFlag): void;
             /**
              * Command to open the workflow menu and to click a desired workflow in the datacontrol viewer section.
              *
              * @param {string} tabName - The name of the tab containing the datacontrol viewer section.
-             * @param {string} buttonName - The workflow entry to be selected.
-             * @param {exactMatchFlag} [exactMatch] - Indicates whether to search for an exact match (equalBool) or not). Default: is disabled.
+             * @param {string} buttonName - The workflow entry to be selected. An entry with exactly this text is preferred over entries that only contain it.
+             * @param {exactMatchFlag} [exactMatch] - Only accept an exact match (equalBool). Default: disabled, falls back to the first entry containing the text when no entry matches exactly.
              *
              * @example - cy.GLO_selectMenuButtonControlView('salesorder', 'Confirm');
              */

package/dist/commands/GLO_commands.js

@@ -473,19 +473,15 @@ Cypress.Commands.add('GLO_clickDatacontrolViewerButton', (pageName, buttonName,
     });
 });
 Cypress.Commands.add('GLO_checkDatacontrolCounter', (buttonName, greyCount, redCount, timeOut = defaultTimeout) => {
-    const button = `globiscomponents-data-control[name="datacontrol"]:visible #${buttonName}`;
-    // Without the button in view a 'not.exist' check below would pass for the wrong reason.
-    cy.get(button, { timeout: timeOut }).should('exist');
+    const button = () => cy.get(`globiscomponents-data-control[name="datacontrol"]:visible [id="${buttonName}"]`, { timeout: timeOut });
+    button().should('exist');
     const checkBadge = (selector, count) => {
-        if (count > 0) {
-            cy.get(selector, { timeout: timeOut }).should('have.text', count.toString());
-        }
-        else {
-            cy.get(selector, { timeout: timeOut }).should('not.exist');
-        }
+        button()
+            .find(selector, { timeout: timeOut })
+            .should(count > 0 ? 'have.text' : 'not.exist', ...(count > 0 ? [count.toString()] : []));
     };
-    checkBadge(`${button} [counter-muted]`, greyCount);
-    checkBadge(`${button} [counter]:not([counter-muted])`, redCount);
+    checkBadge('[counter-muted]', greyCount);
+    checkBadge('[counter]:not([counter-muted])', redCount);
 });
 Cypress.Commands.add('GLO_selectCompany', (companyName) => {
     cy.GLO_addInput(['ng2$svy_nav_login', 'company'], companyName);
@@ -747,27 +743,41 @@ Cypress.Commands.add('GLO_selectTab', (selector, tabName, openOrClose) => {
         }
     });
 });
-Cypress.Commands.add('GLO_selectMenuButton', (buttonName, exactMatch = noEqualBool) => {
-    const searchParam = exactMatch ? new RegExp(`^\\s*${Cypress._.escapeRegExp(buttonName)}\\s*$`) : buttonName;
-    cy.GLO_clickDatacontrolBrowserButton('btnMenu');
+// True when the workflow menu has an entry whose text equals the button text.
+const checkForExactMatch = ($menu, exactText) => $menu
+    .find('.dx-menu-item-text')
+    .toArray()
+    .some((element) => exactText.test(element.textContent ?? ''));
+// Clicks a workflow entry in the open workflow menu. An entry whose text equals buttonName wins over entries
+// that only contain it (e.g. 'Confirm' over a 'Confirm with discrepancies - ...' status change listed above it);
+// without an exact entry it falls back to the first entry containing buttonName, unless exactMatch is set.
+// The choice is made inside .filter(), a query that Cypress retries on the live menu, so it is never decided on a
+// menu that is still rendering or on a snapshot of it.
+const clickWorkflowMenuItem = (buttonName, exactMatch) => {
+    const exactText = new RegExp(`^\\s*${Cypress._.escapeRegExp(buttonName)}\\s*$`);
     cy.GLO_getVisible('.dx-submenu', 10000)
-        .contains(searchParam)
+        .find('.dx-menu-item-text')
+        .filter((_index, element) => {
+        const text = element.textContent ?? '';
+        if (exactMatch || checkForExactMatch(Cypress.$(element).closest('.dx-submenu'), exactText)) {
+            return exactText.test(text);
+        }
+        return text.includes(buttonName);
+    })
+        .first()
         .click()
         .then(() => {
         cy.GLO_checkLoadingIndicator();
     });
     cy.GLO_log(` - Used workflow button '${buttonName}'`);
+};
+Cypress.Commands.add('GLO_selectMenuButton', (buttonName, exactMatch = noEqualBool) => {
+    cy.GLO_clickDatacontrolBrowserButton('btnMenu');
+    clickWorkflowMenuItem(buttonName, exactMatch);
 });
 Cypress.Commands.add('GLO_selectMenuButtonControlView', (tabName, buttonName, exactMatch = noEqualBool) => {
-    const searchParam = exactMatch ? new RegExp(`^\\s*${Cypress._.escapeRegExp(buttonName)}\\s*$`) : buttonName;
     cy.GLO_clickDatacontrolViewerButton(tabName, 'btnMenu');
-    cy.GLO_getVisible('.dx-submenu', 10000)
-        .contains(searchParam)
-        .click()
-        .then(() => {
-        cy.GLO_checkLoadingIndicator();
-    });
-    cy.GLO_log(` - Used workflow button '${buttonName}'`);
+    clickWorkflowMenuItem(buttonName, exactMatch);
 });
 const navItem = (topBottom, programName, tabNumber, mode) => {
     if (topBottom !== top && topBottom !== bottom)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@globisnv/cypress-core",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Core building blocks for Globis Cypress E2E tests",
     "license": "UNLICENSED",
     "type": "module",