@globisnv/cypress-core 1.1.3 → 1.1.4

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.js

@@ -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);
         }
     });
 });

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/package.json

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