@globisnv/cypress-core 1.1.3 → 1.2.0

package/dist/blueprints/GLO_commandlist.js

@@ -5,6 +5,6 @@ export const GLO_enterCommandlist = (obj) => {
     cy.GLO_addDate(input, [formName, 'valid_from'], obj.validFrom);
     cy.GLO_addDate(input, [formName, 'valid_till'], obj.validTo);
     cy.GLO_checkbox([formName, 'allow_automatic_update'], obj.allowAutomaticUpdate);
-    cy.GLO_popupWindow([formName, 'btn_select_relation'], obj.customerRelation);
+    cy.GLO_popupWindow([formName, 'relation_id'], obj.customerRelation);
     cy.GLO_addInput([formName, 'commandlist_code'], obj.commandlistCode);
 };

package/dist/blueprints/GLO_consignment.d.ts

@@ -56,6 +56,8 @@ export type objConsignment = {
     etd?: string;
     eta?: string;
     fileReference?: string;
+    loadStartRequested?: string;
+    unloadStartRequested?: string;
 };
 export declare const GLO_enterConsignment: (obj: objConsignment, formName?: string, formNameGeneral?: string, formNameSea?: string, formNameWarehouse?: string) => void;
 export declare const GLO_enterConsignment$Terminal: (obj: objConsignment) => void;

package/dist/blueprints/GLO_consignment.js

@@ -1,4 +1,4 @@
-import { close, equal, input, open } from '../tsHelper.js';
+import { close, equal, equalBool, input, open, typeSearch } from '../tsHelper.js';
 import { GLO_enterAddressPopup } from './GLO_addressPopup.js';
 const defaultFormName = 'ng$consignment_dtl';
 const defaultFormNameGeneral = 'ng$consignment_dtl_general';
@@ -25,7 +25,14 @@ export const GLO_enterConsignment = (obj, formName = defaultFormName, formNameGe
     cy.GLO_validateCheckbox([formName, 'flag_spot'], obj.flagSpotOrder);
     cy.GLO_addInput([formName, 'plan_bloc'], obj.planBloc);
     cy.GLO_addInput([formName, 'file_reference_txt'], obj.fileReference);
-    if (obj.collectionAddress || obj.deliveryAddress || obj.loadStartBooked || obj.loadEndBooked || obj.loadStartBookedTime || obj.loadEndBookedTime) {
+    if (obj.collectionAddress ||
+        obj.deliveryAddress ||
+        obj.loadStartBooked ||
+        obj.loadEndBooked ||
+        obj.loadStartBookedTime ||
+        obj.loadEndBookedTime ||
+        obj.loadStartRequested ||
+        obj.unloadStartRequested) {
         cy.GLO_selectTab([formName, 'tabs_70'], 'General', open);
         if (obj.collectionAddress) {
             cy.GLO_clickButton([formNameGeneral, 'btn_select_from_address'], 'fa-search-plus');
@@ -39,6 +46,8 @@ export const GLO_enterConsignment = (obj, formName = defaultFormName, formNameGe
             obj.deliveryAddress.type ??= 'search';
             GLO_enterAddressPopup(obj.deliveryAddress);
         }
+        cy.GLO_addDate(input, [formNameGeneral, 'load_start_requested'], obj.loadStartRequested);
+        cy.GLO_addDate(input, [formNameGeneral, 'unload_start_requested'], obj.unloadStartRequested);
         cy.GLO_addDate(input, [formNameGeneral, 'load_start_booked'], obj.loadStartBooked);
         cy.GLO_addDate(input, [formNameGeneral, 'load_start_booked_time'], obj.loadStartBookedTime);
         cy.GLO_addDate(input, [formNameGeneral, 'load_end_booked'], obj.loadEndBooked);
@@ -83,8 +92,8 @@ const seaTab = (obj, formName, formNameSea) => {
     cy.GLO_addInput([formNameSea, 'txt_shipper_reference'], obj.shipperRef);
     cy.GLO_addInput([formNameSea, 'supplier_incoterm'], obj.shipperIncoTerm);
     cy.GLO_addInput([formNameSea, 'quay_code'], obj.quayCode);
-    cy.GLO_addInput([formNameSea, 'from_logistic_location'], obj.POL);
-    cy.GLO_addInput([formNameSea, 'to_logistic_location'], obj.POD);
+    cy.GLO_popupWindow([formNameSea, 'from_logistic_location'], obj.POL, undefined, equalBool, typeSearch);
+    cy.GLO_popupWindow([formNameSea, 'to_logistic_location'], obj.POD, undefined, equalBool, typeSearch);
     cy.GLO_addInput([formNameSea, 'transport_method'], obj.transportMethod);
     cy.GLO_addDate(input, [formNameSea, 'atd'], obj.atd);
     cy.GLO_addDate(input, [formNameSea, 'goods_closing'], obj.goodsClosing);

package/dist/blueprints/GLO_quotationLine.js

@@ -11,6 +11,11 @@ const enterQuotationLine = (useNew, obj) => {
     const formNameInnerBreak = 'ng$quotationlines_dtl_quantity';
     const articleSelector = useNew ? 'article_code' : 'btn_select_article';
     cy.GLO_popupWindow([formName, articleSelector], obj.articleCode);
+    // The article selection triggers a double load, so wait until the field really holds the article
+    // A falsy article code leaves the current article untouched, so there is nothing to wait for
+    if (obj.articleCode) {
+        cy.GLO_checkField([formName, 'article_code'], obj.articleCode, undefined, 300000);
+    }
     if (obj.quantityBreaks && obj.quantityBreaks.length > 0) {
         cy.GLO_selectTab([formName, 'tabs_470'], 'Quantity breaks', open);
         obj.quantityBreaks.forEach((qtyBreak, index) => {

package/dist/commands/GLO_commands.d.ts

@@ -605,6 +605,36 @@ declare global {
              * @param {number} [interval] - use this TOGETHER with timeOut for slow-running updates (e.g. batch process) (default: 15s)
              */
             GLO_validateGridOrFail(waitValue: string, failValue: string, rowNumber?: number, columnId?: string, timeOut?: number, interval?: number): void;
+            /**
+             * Command to wait until a field shows a value, and to fail instantly when it shows a fail value.
+             * The field counterpart of GLO_validateGridOrFail, e.g. for a status that is updated by a running process.
+             * The displayed value is checked, as in GLO_checkField (the text of a valuelist, not its stored code).
+             *
+             * @param {selectorType} selector - [formName, elementName] of the field.
+             * @param {string} waitValue - The value to wait for.
+             * @param {string | string[]} failValue - The value(s) that stop the waiting and fail instantly.
+             * @param {number} [timeOut] - how long it should wait for the field to update, default: 10m
+             * @param {number} [interval] - how often the field is checked, default: 15s
+             * @example - cy.GLO_validateFieldOrFail(['ng$billing_task_dtl', 'status'], 'Finished', ['Error', 'Finished with error'], 300000, 2000);
+             */
+            GLO_validateFieldOrFail(selector: selectorType, waitValue: string, failValue: string | string[], timeOut?: number, interval?: number): void;
+            /**
+             * Executes a batch processing type and waits until the run it started has finished.
+             * The last run of the type is remembered before Execute, so a run that finished earlier is never taken for
+             * the new one (row 0 of the 'Batch processing' tab is still the previous run right after Execute).
+             * The command opens 'Batch processing type' itself and closes it again when the run has finished.
+             *
+             * @param {string} batchType - The value to filter the batch processing type list on.
+             * @param {string} [columnId='description'] - The column of the batch processing type list to filter on (e.g. 'description', 'transaction_type_text', 'batch_module').
+             * @param {string | null} [waitValue='Completed'] - The status the new run must end with. Use null to only wait until the run has finished, whatever its status,
+             * e.g. for a batch that processes the records of the whole environment, where one record of a parallel test can turn the run into Error.
+             * @param {string} [failValue='Error'] - The status that stops the waiting and fails instantly (not used when waitValue is null).
+             * @param {number} [timeOut] - how long it should wait for the run to finish, default: 20m
+             * @param {number} [interval] - how often the 'Batch processing' tab is checked, default: 15s
+             * @returns {Chainable<batchRunType>} - Yields the new run (submitted, completed, status, error message).
+             * @example - cy.GLO_executeBatchProcess('Batch processor accountancy SALES', 'batch_module', null);
+             */
+            GLO_executeBatchProcess(batchType: string, columnId?: string, waitValue?: string | null, failValue?: string, timeOut?: number, interval?: number): Chainable<batchRunType>;
             /**
              * Store the value(s) of one or more fields into the nested '@saveData' alias:
              *   saveData[formName][elementName] = value

package/dist/commands/GLO_commands.js

@@ -1,4 +1,4 @@
-import { bottom, buttonSearch, check, contains, cypressWebsocketLoader, defaultTimeout, enabled, equal, greaterEqual, gridDropDown, gridInput, gridInputWithoutEnter, gridSelect, hideInCommandLog, input, isInvalid, noEqualBool, noSkipCheck, notEqual, parseLocalizedNumber, row, select, skipCheck, span, top, unCheck } from '../tsHelper.js';
+import { bottom, buttonSearch, check, contains, cypressWebsocketLoader, defaultTimeout, enabled, equal, greaterEqual, gridDropDown, gridInput, gridInputWithoutEnter, gridSelect, hideInCommandLog, input, isInvalid, noEqualBool, noSkipCheck, notEqual, open, parseLocalizedNumber, row, select, skipCheck, span, top, unCheck } from '../tsHelper.js';
 import { attachWebSocketSpy } from '../websocketDetector.js';
 //! File-specific helpers
 const monthNames = ['januari', 'februari', 'maart', 'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november', 'december'];
@@ -1336,7 +1336,8 @@ Cypress.Commands.add('GLO_popupWindow', (selector, value, columnId, equals = noE
             selectFromPopupWindow(value, columnId, equals);
         }
         else {
-            cy.GLO_checkField(selector, value, equals ? contains : undefined);
+            // Type search with an exact match must stay exact: a contains check would accept LOC1 for LOC10.
+            cy.GLO_checkField(selector, value, equals ? (useMagnifierFlag ? contains : equal) : undefined);
         }
     });
 });
@@ -2007,6 +2008,111 @@ Cypress.Commands.add('GLO_getAllRowsInGrid', (selector, timeOut = defaultTimeout
 Cypress.Commands.add('GLO_validateGridOrFail', (waitValue, failValue, rowNumber, columnId, timeOut = 600000, interval = 15000) => {
     validateGridValue(waitValue, failValue, rowNumber, columnId, timeOut, interval);
 });
+Cypress.Commands.add('GLO_validateFieldOrFail', (selector, waitValue, failValue, timeOut = 600000, interval = 15000) => {
+    const failValues = Array.isArray(failValue) ? failValue : [failValue];
+    const maxAttempts = Math.max(1, Math.ceil(timeOut / interval));
+    const fieldName = selector.join('.');
+    const checkField = (attempt = 1) => {
+        // Same value as GLO_checkField reads: the displayed text, with html and other unicode spaces normalized
+        cy.GLO_getElement(selector).then(($field) => {
+            const fieldValue = String($field.find('.dx-texteditor-input').val()).replace(/\s+/g, ' ').trim();
+            if (fieldValue === waitValue) {
+                cy.log(`${fieldName} is "${waitValue}"`);
+                return;
+            }
+            if (failValues.includes(fieldValue)) {
+                throw new Error(`${fieldName} is "${fieldValue}" (waited for "${waitValue}")`);
+            }
+            if (attempt >= maxAttempts) {
+                throw new Error(`${fieldName} is still "${fieldValue}" after ${timeOut / 1000}s (waited for "${waitValue}")`);
+            }
+            // biome-ignore lint/plugin/noUnnecessaryWaiting: wait for next poll interval before checking again
+            cy.wait(interval, { log: false }).then(() => {
+                checkField(attempt + 1);
+            });
+        });
+    };
+    checkField();
+});
+Cypress.Commands.add('GLO_executeBatchProcess', (batchType, columnId = 'description', waitValue = 'Completed', failValue = 'Error', timeOut = 1200000, interval = 15000) => {
+    const formNameTypeList = 'ng$batch_execution_type_lst';
+    const formNameTypeTab = 'ng$batch_execution_type_tab';
+    const formNameRunList = 'ng$batch_execution_lst';
+    const maxAttempts = Math.max(1, Math.ceil(timeOut / interval));
+    // Row 0 of the run list is the most recent run (sorted on process_submitted desc); an empty list has no run yet.
+    // Without these columns (hidden in a custom view) a new run can never be recognised, so that fails at once.
+    const requiredColumns = ['process_submitted', 'process_completed', 'process_status'];
+    const readLastRun = () => {
+        const noRun = { submitted: '', completed: '', status: '', errorMessage: '' };
+        return cy.GLO_getElement([formNameRunList, 'grid']).then(($grid) => {
+            if ($grid.find('.ag-center-cols-container [row-index]').length === 0) {
+                return cy.wrap(noRun, { log: false });
+            }
+            return cy
+                .wrap($grid, { log: false })
+                .within(() => {
+                cy.GLO_getRowInGrid(0).then(($row) => {
+                    const missingColumns = requiredColumns.filter((requiredColumnId) => $row.find(`[col-id="${requiredColumnId}"]`).length === 0);
+                    if (missingColumns.length) {
+                        throw new Error(`The 'Batch processing' tab of ${batchType} does not show the column(s) ${missingColumns.join(', ')}`);
+                    }
+                    const cellText = (cellColumnId) => $row.find(`[col-id="${cellColumnId}"]`).text().trim();
+                    cy.wrap({
+                        submitted: cellText('process_submitted'),
+                        completed: cellText('process_completed'),
+                        status: cellText('process_status'),
+                        errorMessage: cellText('last_error_message')
+                    }, { log: false }).as('COM_batchRun');
+                });
+            })
+                .then(() => cy.get('@COM_batchRun', { log: false }));
+        });
+    };
+    // The completion time (process_completed) is stamped for every final status, Completed as well as Error
+    const waitForNewRun = (previousSubmitted, attempt = 1) => {
+        cy.GLO_checkAGLoader();
+        return readLastRun().then((run) => {
+            const isNewRun = run.submitted !== '' && run.submitted !== previousSubmitted;
+            const hasFailed = waitValue !== null && run.status === failValue;
+            if (isNewRun && (run.completed !== '' || hasFailed)) {
+                cy.GLO_log(`Batch run of ${run.submitted} (${batchType}) finished with status "${run.status}" ${run.errorMessage}`);
+                if (hasFailed) {
+                    throw new Error(`Batch run of ${run.submitted} (${batchType}) ended with status "${run.status}": ${run.errorMessage}`);
+                }
+                if (waitValue !== null) {
+                    expect(run.status, `status of the batch run of ${run.submitted} (${batchType})`).to.equal(waitValue);
+                }
+                return cy.wrap(run, { log: false });
+            }
+            if (attempt >= maxAttempts) {
+                throw new Error(`No finished run of ${batchType} after ${timeOut / 1000}s (last run submitted: ${run.submitted})`);
+            }
+            // biome-ignore lint/plugin/noUnnecessaryWaiting: wait for next poll interval before checking again
+            return cy.wait(interval, { log: false }).then(() => waitForNewRun(previousSubmitted, attempt + 1));
+        });
+    };
+    cy.GLO_searchHeader('Batch processes', 'Batch processes', 'Batch processing type');
+    cy.GLO_clickDatacontrolBrowserButton('btnAll');
+    // A filter typed while the list is still loading is lost
+    cy.GLO_checkAGLoader();
+    // Equals, not contains: 'CALCULATE INVOICE' must not select 'CALCULATE INVOICE RETOUR'
+    cy.GLO_filterGrid(columnId, [formNameTypeList, 'grid'], batchType, undefined, 'Equals');
+    cy.GLO_getElement([formNameTypeList, 'grid']).within(() => {
+        cy.GLO_checkValueGrid(batchType, 0, columnId, undefined, undefined, equal);
+    });
+    cy.GLO_selectTab([formNameTypeTab, 'tabs'], 'Batch processing', open);
+    cy.GLO_checkAGLoader();
+    return readLastRun().then((previousRun) => {
+        cy.GLO_selectMenuButton('Execute');
+        cy.GLO_log(`Executed batch processing type ${batchType}`);
+        return waitForNewRun(previousRun.submitted).then((run) => {
+            // Every call opens the program, so it is closed again: a second instance would keep a hidden run list in
+            // the page, and the caller gets back the programs it had open
+            cy.GLO_closeProgram(top, 'Batch processing type');
+            return cy.wrap(run, { log: false });
+        });
+    });
+});
 const validateGridValue = (value, failValue, rowFilter, columnId, timeOut = 10000, interval, operator = contains) => {
     const assertOrCheckCellValue = ($cells, toCheck, doAssert) => {
         const compare = (cellText) => {

package/dist/commands/GLS_commands.js

@@ -14,29 +14,13 @@ Cypress.Commands.add('GLS_login', (username = 'PR001', company) => {
     cy.GLO_checkLoadingIndicator();
 });
 Cypress.Commands.add('GLS_mainNavigation', (value) => {
-    const scrollAndSearch = (attempts = 0) => {
-        if (attempts > 20) {
-            throw new Error(`Could not find menu item: ${value}`);
-        }
-        return cy
-            .get('.ag-body-viewport')
-            .first()
-            .then(($viewport) => {
-            const $label = $viewport.find('label').filter((_i, el) => el.innerText.trim() === value);
-            if ($label.length > 0 && $label.is(':visible')) {
-                return cy.contains('.ag-body-viewport label', value).click();
-            }
-            return cy
-                .get('.ag-center-cols-container [role="row"][tabindex="0"]')
-                .first()
-                .focus()
-                .realPress('ArrowDown')
-                .then(() => scrollAndSearch(attempts + 1));
-        });
-    };
-    scrollAndSearch().then(() => {
-        cy.GLO_checkLoadingIndicator();
-    });
+    // Exact match, so 'Wegzetten' does not open 'Wegzetten drager'. A menu level that is still mounted but hidden is skipped
+    // through its [hidden] container instead of :visible, which also drops items scrolled out of the list (see isInOpenContainer)
+    const exactText = new RegExp(`^\\s*${Cypress._.escapeRegExp(value)}\\s*$`);
+    cy.get('.svy-listformcomponent label.clickable')
+        .filter((_i, el) => !el.closest('[hidden]') && exactText.test(el.innerText))
+        .click();
+    cy.GLO_checkLoadingIndicator();
 });
 Cypress.Commands.add('GLS_selectStock', (formName, elementName, index) => {
     cy.GLO_getElement([formName, elementName]).find(`.item-container#${index}`).click();

package/dist/types.d.ts

@@ -12,6 +12,12 @@ type deleteRecordsType = 'DELETE_CYPRESS_RECORDS' | 'DELETE_LEAPWORK_RECORDS';
 type viewModeButtonType = 'btnList' | 'btnDetail';
 type datacontrolbuttonType = baseDatacontrolViewerButtonType | viewModeButtonType | 'btnPrev' | 'btnNext' | 'btnAll' | 'btnPivot' | 'btnAttachment' | 'btnAddMode' | 'btnEditMode' | 'btnDeleteMode' | 'btnDeeplink' | 'btnExtendedSearch' | 'btnCustomViews' | 'btnFilter' | 'btnClearAllFilters';
 type checkValueInGridType = string | string[] | number;
+type batchRunType = {
+    submitted: string;
+    completed: string;
+    status: string;
+    errorMessage: string;
+};
 type selectMenuButtonLeftType = 'home' | 'settings' | 'help' | 'support' | 'excel' | 'info' | 'refresh' | 'query' | 'clients' | 'users' | 'theme';
 type urlTypeType = 'online' | 'pos' | 'globgate' | 'globjob' | 'globscan' | 'portal' | 'carrier' | 'globtrace' | 'external_portal' | 'globtake' | 'globis_external_portal';
 type customValueType = JQuery | string | number;

package/package.json

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