@sap_oss/wdio-qmate-service 2.19.0 → 3.0.1

package/lib/scripts/locators/qmateLocatorSrc/utils/UI5ControlHandler.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UI5ControlHandler = void 0;
+const ControlFinder_1 = require("../utils/ControlFinder");
+const LocatorDebug_1 = require("../utils/LocatorDebug");
+class UI5ControlHandler {
+    static retrieveValidUI5ControlsSubElements(nodes) {
+        if (!nodes || nodes.length === 0) {
+            return [];
+        }
+        const aCandidateControls = [];
+        Array.prototype.forEach.call(nodes, (node) => {
+            const nodeId = node.getAttribute("id");
+            const control = ControlFinder_1.ControlFinder.getUI5Control(nodeId);
+            if (control) {
+                aCandidateControls.push(control);
+            }
+            else {
+                aCandidateControls.push(...UI5ControlHandler.retrieveValidUI5ControlsSubElements(node.children));
+            }
+        });
+        return aCandidateControls;
+    }
+    static extractBindingPathAndModelProperty(pathObj) {
+        const binding = {
+            model: "",
+            path: ""
+        };
+        if (!pathObj?.path)
+            return binding;
+        binding.path = pathObj.path;
+        if (pathObj.path.indexOf(">") !== -1) {
+            binding.model = pathObj.path.substring(0, pathObj.path.indexOf(">"));
+            binding.path = pathObj.path.substring(pathObj.path.indexOf(">") + 1, pathObj.path.length);
+        }
+        return binding;
+    }
+    static findSiblingControls(control) {
+        const parentControl = UI5ControlHandler.getUI5Parent(control);
+        const parentId = parentControl?.getId?.();
+        const controlId = control?.getId?.();
+        if (!parentControl || !parentId || !controlId) {
+            return [];
+        }
+        const parentElement = document.getElementById(parentId);
+        if (!parentElement) {
+            return [];
+        }
+        const allSiblingNodes = parentElement.children;
+        const aValidControls = UI5ControlHandler.retrieveValidUI5ControlsSubElements(allSiblingNodes);
+        if (!aValidControls || aValidControls.length === 0)
+            return [];
+        const controlIndx = aValidControls.findIndex((element) => element.getId() === controlId);
+        if (controlIndx === -1) {
+            throw new Error("Something is very wrong with prev/next control finder");
+        }
+        else {
+            aValidControls.splice(controlIndx, 1);
+            return aValidControls;
+        }
+    }
+    static findPreviousOrNextControl(control, bIsNext) {
+        const oParentControl = UI5ControlHandler.getUI5Parent(control);
+        const sControlId = control?.getId?.();
+        const sParentId = oParentControl?.getId?.();
+        if (!oParentControl || !sParentId || !sControlId)
+            return null;
+        const parentElement = document.getElementById(sParentId);
+        if (!parentElement)
+            return null;
+        const aAllSiblingNodes = parentElement.children;
+        const aValidControls = UI5ControlHandler.retrieveValidUI5ControlsSubElements(aAllSiblingNodes);
+        const controlIndx = aValidControls.findIndex((element) => element.getId() === sControlId);
+        if (controlIndx === -1) {
+            console.error("Something is very wrong with prev/next control finder");
+        }
+        if (bIsNext && aValidControls.length - 1 > controlIndx) {
+            return aValidControls[controlIndx + 1];
+        }
+        else if (!bIsNext && controlIndx > 0) {
+            return aValidControls[controlIndx - 1];
+        }
+        return null;
+    }
+    static getControlBindingContextPaths(control) {
+        if (!control)
+            return [];
+        // Merge all possible binding context sources
+        const bindingContexts = Object.assign({}, control.oPropagatedProperties?.oBindingContexts, control.oBindingContexts, control.mElementBindingContexts);
+        return Object.values(bindingContexts)
+            .filter((value) => !!value && value.getPath && typeof value.getPath === "function")
+            .map((ctx) => ctx.getPath())
+            .filter((path) => path);
+    }
+    // first navigate up the DOM tree to find the UI5 parent element
+    // if none is found try with the ui5 getParent method
+    // if none is found return undefined
+    static getUI5Parent(control) {
+        let domParent = document.getElementById(control.getId?.())?.parentElement;
+        while (true) {
+            if (!domParent)
+                return control.getParent?.();
+            const oParentControl = ControlFinder_1.ControlFinder.getUI5Control(domParent.getAttribute("id"));
+            if (oParentControl) {
+                return oParentControl;
+            }
+            domParent = domParent.parentElement;
+        }
+    }
+    static getControlProperty(control, propKey) {
+        if (!control || !propKey)
+            return undefined;
+        const metadata = control.getMetadata?.();
+        const property = metadata?.getProperty?.(propKey);
+        const aggregation = metadata?.getAggregation?.(propKey);
+        const association = metadata?.getAssociation?.(propKey);
+        return (property ?? aggregation ?? association)?.get?.(control);
+    }
+    static getControlAllProperties(control) {
+        return {
+            ...control?.getMetadata?.()?.getAllProperties?.(),
+            ...control?.getMetadata?.()?.getAllAssociations?.(),
+            ...control?.getMetadata?.()?.getAllAggregations?.()
+        };
+    }
+    static getBindDataForProperty(control, propKey) {
+        const aProperties = UI5ControlHandler.getControlAllProperties(control);
+        if (aProperties.hasOwnProperty(propKey)) {
+            return UI5ControlHandler.getBindingInfos(control, propKey);
+        }
+        return [];
+    }
+    static createBindingInfo(part) {
+        return {
+            model: part.model || "",
+            path: part.path || "",
+            value: ""
+        };
+    }
+    static getBindingInfos(control, propKey) {
+        const bindingInfo = control.getBindingInfo?.(propKey);
+        if (!bindingInfo)
+            return [];
+        const parts = (bindingInfo.parts ?? []);
+        const infos = [];
+        infos.push(...parts.filter((part) => part.path).map(UI5ControlHandler.createBindingInfo));
+        if (infos.length === 0 && bindingInfo.path) {
+            infos.push(UI5ControlHandler.createBindingInfo(bindingInfo));
+        }
+        const binding = control.getBinding?.(propKey);
+        if (binding && infos.length > 0) {
+            UI5ControlHandler.retrieveCompositeBindings(binding, infos);
+        }
+        return infos;
+    }
+    static retrieveCompositeBindings(binding, bindingInfos) {
+        if (binding.getBindings) {
+            const subBindings = binding.getBindings() ?? [];
+            subBindings.forEach((subBinding) => UI5ControlHandler.retrieveCompositeBindings(subBinding, bindingInfos));
+        }
+        else if (binding.getPath && binding.getValue) {
+            const info = bindingInfos.find((bi) => bi.path === binding.getPath());
+            if (info) {
+                info.value = binding.getValue();
+            }
+        }
+    }
+    static getUI5Ancestors(control) {
+        const MAXIMUM_DEPTH = 500;
+        const ancestors = [];
+        let parentControl = UI5ControlHandler.getUI5Parent(control);
+        const visited = new Set();
+        visited.add(control);
+        while (parentControl && !visited.has(parentControl) && ancestors.length < MAXIMUM_DEPTH) {
+            ancestors.push(parentControl);
+            visited.add(parentControl);
+            parentControl = UI5ControlHandler.getUI5Parent(parentControl);
+        }
+        if (ancestors.length >= MAXIMUM_DEPTH) {
+            LocatorDebug_1.LocatorDebug.debugLog("Maximum depth reached while retrieving ancestors for control", control.getId?.());
+        }
+        LocatorDebug_1.LocatorDebug.debugLog("found ancestors:" + ancestors.length);
+        return ancestors;
+    }
+}
+exports.UI5ControlHandler = UI5ControlHandler;
+//# sourceMappingURL=UI5ControlHandler.js.map

package/lib/scripts/locators/qmateLocatorSrc/utils/UI5ControlHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UI5ControlHandler.js","sourceRoot":"","sources":["../../../../../src/scripts/locators/qmateLocatorSrc/utils/UI5ControlHandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap_oss/wdio-qmate-service",
-  "version": "2.19.0",
+  "version": "3.0.1",
   "author": "SAP SE",
   "types": "./@types/index.d.ts",
   "main": "./lib/index.js",
@@ -34,8 +34,9 @@
     "generate-types": "ts-node ./src/bin/typesGenerator",
     "serve-docs": "npm run generate-docs && mkdocs serve",
     "deploy-docs": "npm run generate-docs && mkdocs gh-deploy --force",
-    "build": "npx tsc",
-    "build:dev": "npx tsc --watch",
+    "build": "npm run build:locator  && npx tsc",
+    "build:dev": "npm run build:locator && npx tsc --watch",
+    "build:locator": "node src/scripts/locators/qmateLocatorSrc/build.js",
     "test:authenticator:staticLogin:custom": "npx wdio ./test/authenticator/staticLogin/configCustom.js",
     "test:authenticator:staticLogin:customViaConfig": "npx wdio ./test/authenticator/staticLogin/configCustomViaConfig.js",
     "test:authenticator:staticLogin:fiori": "npx wdio ./test/authenticator/staticLogin/configFiori.js",
@@ -168,7 +169,8 @@
     "chromedriver": "^120.0.2",
     "concurrently": "^7.6.0",
     "doctrine": "^3.0.0",
-    "eslint": "^6.8.0",
+    "esbuild": "0.25.4",
+    "eslint": "^8.57.0",
     "eslint-plugin-wdio": "^6.6.0",
     "glob": "^8.1.0",
     "glob-promise": "^5.0.1",

package/test/core/testIntegration/filters1.spec.js

@@ -199,31 +199,32 @@ describe("filters1", function () {
       .rejects.toThrow(/No visible elements found with selector/);
   });
 
-  it("Step 09: check Page has descendant text - use deep selector structure in elementProperties", async function () {
-    var ui5ControlProperties = {
-      "elementProperties": {
-        "metadata": "sap.m.Page", "mProperties": {
-          "id": "container-cart---welcomeView--page"
-        },
-        "descendantProperties": {
-          "metadata": "sap.m.Text", "mProperties": {
-            "text": [{ "path": "i18n>welcomeCarouselShipping" }],
-            "ancestorProperties": {
-              "viewName": "*view.Welcome",
-              "tooltip": [{ "path": "i18n>welcomeDescription" }],
-              "descendantProperties": {
-                "metadata": "sap.m.ScrollContainer",
-                "domProperties": {
-                  "class": "*sapMScrollCont"
-                }
-              }
-            }
-          }
-        }
-      },
-    };
-    await ui5.assertion.expectAttributeToBe(ui5ControlProperties, "showHeader", "true", 0, 30000, 30000);
-  });
+  // can not work there is no ScrollContainer on the whole page
+  // it("Step 09: check Page has descendant text - use deep selector structure in elementProperties", async function () {
+  //   var ui5ControlProperties = {
+  //     "elementProperties": {
+  //       "metadata": "sap.m.Page", "mProperties": {
+  //         "id": "container-cart---welcomeView--page"
+  //       },
+  //       "descendantProperties": {
+  //         "metadata": "sap.m.Text", "mProperties": {
+  //           "text": [{ "path": "i18n>welcomeCarouselShipping" }],
+  //           "ancestorProperties": {
+  //             "viewName": "*view.Welcome",
+  //             "tooltip": [{ "path": "i18n>welcomeDescription" }],
+  //             "descendantProperties": {
+  //               "metadata": "sap.m.ScrollContainer",
+  //               "domProperties": {
+  //                 "class": "*sapMScrollCont"
+  //               }
+  //             }
+  //           }
+  //         }
+  //       }
+  //     },
+  //   };
+  //   await ui5.assertion.expectAttributeToBe(ui5ControlProperties, "showHeader", "true", 0, 30000, 30000);
+  // });
 
   it("Step 10: check Page has descendant text - use deep selector structure wrong", async function () {
     var ui5ControlProperties = {
@@ -1081,7 +1082,7 @@ describe("filters1", function () {
       "parentProperties": { "metadata": "sap.m.ObjectListItem", "mProperties": { "bindingContextPath": "/Products('HT-2026')" } },
       "ancestorProperties": {
         "metadata": "sap.m.List", "mProperties": {
-          "bindingContextPath": "ProductCategories('AC')*",
+          "bindingContextPath": "/ProductCategories('AC')*",
           "items": { "path": "Products" }
         }
       },

package/test/helper/utils.js

@@ -2,18 +2,37 @@ exports.handleCookiesConsent = async function handleCookiesConsent() {
   // eslint-disable-next-line no-undef
   await util.function.executeOptional(async function () {
     const oldCookiesConsentDialog = {
-      "elementProperties": {
-        "viewName": "sap.ui.documentation.sdk.view.App",
-        "metadata": "sap.m.Button",
-        "text": [{
-          "path": "i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_ACCEPT_ALL"
-        }]
+      elementProperties: {
+        viewName: "sap.ui.documentation.sdk.view.App",
+        metadata: "sap.m.Button",
+        text: [
+          {
+            path: "i18n>COOKIE_SETTINGS_DIALOG_FUNCTIONAL_COOKIES_ACCEPT_ALL"
+          }
+        ]
       }
     };
+    const testCookie = await browser.getCookies(["cmapi_cookie_privacy"]);
+    if (testCookie.length > 0) {
+      // cookie already set
+      return;
+    }
     const newCookiesConsentDialog = "button[id='truste-consent-button']";
-    await Promise.any([
-      ui5.userInteraction.click(oldCookiesConsentDialog, 0, 15000),
-      nonUi5.userInteraction.click(newCookiesConsentDialog, 0, 15000)
-    ]);
+    await browser.waitUntil(
+      async () => {
+        try {
+          await Promise.any([ui5.userInteraction.click(oldCookiesConsentDialog, 0, 500), nonUi5.userInteraction.click(newCookiesConsentDialog, 0, 500)]);
+          return true;
+        } catch (error) {
+          // Ignore error and continue to next promise
+          return false;
+        }
+      },
+      {
+        timeout: 15000,
+        timeoutMsg: "Cookies consent dialog not found",
+        interval: 100
+      }
+    );
   }, []);
-};
+};

package/test/reuse/ui5/session/logout.spec.js

@@ -45,6 +45,6 @@ describe("session - logout without login (unhappy case)", function () {
 
   it("Execution & Verification", async function () {
     await expect(ui5.session.logout())
-      .rejects.toThrow(/uiControlExecuteLocator\(\): No visible elements found/);
+      .rejects.toThrow(/Function 'logout' failed with: Could not click User Icon/);
   });
 });

package/test/reuse/ui5/table/sortColumnDescending.spec.js

@@ -58,30 +58,4 @@ describe("table - sortColumnDescending - smartTable with tableSelector", functio
     await ui5.assertion.expectAttributeToBe(selector, "sortIndicator", "Descending");
   });
 
-});
-
-describe("table - sortColumnDescending - smartTable with index (legacy)", function () {
-
-  it("Preparation", async function () {
-    await browser.url("https://sapui5.hana.ondemand.com/#/entity/sap.ui.comp.smarttable.SmartTable/sample/sap.ui.comp.sample.smarttable.mtable");
-    await handleCookiesConsent();
-    await util.browser.switchToIframe("[id='sampleFrame']");
-  });
-
-  it("Execution", async function () {
-    const index = 0; // deprecated
-    await ui5.table.sortColumnDescending("Name", index);
-  });
-
-  it("Verification", async function () {
-    const selector = {
-      "elementProperties": {
-        "viewName": "sap.ui.comp.sample.smarttable.mtable.SmartTable",
-        "metadata": "sap.m.Column",
-        "tooltip": "Name"
-      }
-    };
-    await ui5.assertion.expectAttributeToBe(selector, "sortIndicator", "Descending", 0);
-  });
-
 });

package/test/reuse/ui5/userInteraction/searchFor.spec.js

@@ -12,13 +12,15 @@ describe("userInteraction - searchFor - use button", function () {
 
   it("Execution", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const value = "Laptop";
@@ -30,13 +32,15 @@ describe("userInteraction - searchFor - use button", function () {
 
   it("Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const valueExp = "Laptop";
@@ -55,13 +59,15 @@ describe("userInteraction - searchFor - use Enter", function () {
 
   it("Execution", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const value = "Laptop";
@@ -73,13 +79,15 @@ describe("userInteraction - searchFor - use Enter", function () {
 
   it("Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const valueExp = "Laptop";
@@ -98,13 +106,15 @@ describe("userInteraction - searchFor - use Enter and wrong selector", function
 
   it("Execution & Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sarchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sarchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.rchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const value = "Laptop";
@@ -126,13 +136,15 @@ describe("userInteraction - resetSearch", function () {
 
   it("Execution", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const value = "Laptop";
@@ -144,13 +156,15 @@ describe("userInteraction - resetSearch", function () {
 
   it("Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.m.sample.SearchField.Page",
-        "metadata": "sap.m.SearchField"
+      elementProperties: {
+        viewName: "sap.m.sample.SearchField.Page",
+        metadata: "sap.m.SearchField"
       },
-      "siblingProperties": {
-        "metadata": "sap.m.Toolbar",
-        "viewName": "sap.m.sample.SearchField.Page"
+      ancestorProperties: {
+        siblingProperties: {
+          metadata: "sap.m.Toolbar",
+          viewName: "sap.m.sample.SearchField.Page"
+        }
       }
     };
     const valueExp = "";

package/tsconfig.json

@@ -20,6 +20,6 @@
     "skipLibCheck": true /* Skip type checking all .d.ts files. */,
     "sourceMap": true
   },
-  "include": ["src/**/*.ts", "src/**/*.js", "@types/index.d.ts", "src/**/*.json"],
-  "exclude": ["lib"]
+  "include": ["src/**/*.ts", "src/**/*.js", "@types/index.d.ts", "@types/locatorTypes.d.ts", "src/**/*.json"],
+  "exclude": ["lib", "src/scripts/locators/qmateLocatorSrc/build.js"]
 }