@kogeet/sagent-playwright 0.2.7 → 0.2.8

package/bin/index.js

@@ -6,9 +6,6 @@ import { sagent } from "@kogeet/scapin-core-agent";
 import BrowserLib from "./libs/BrowserLib.js";
 import StdLib from "./libs/StdLib.js";
 import DatasetEntryPoints from "@kogeet/sagent-plugin-dataset";
-// import {parseParam} from "@kogeet/sapi-parser";
-// const r = parseParam('"text"', 'Text')
-// console.log('result:', r)
 const loadJSON = (path) => JSON.parse(fs.readFileSync(new URL(path, import.meta.url)).toString());
 const pjson = loadJSON('../package.json');
 // Librairies prises en charge

package/bin/libs/StdLib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StdLib.d.ts","sourceRoot":"","sources":["../../src/libs/StdLib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAM3D,MAAM,CAAC,OAAO,OAAO,MAAM;IAEzB,OAAc,WAAW,uCAsBvB;IAEF;;;OAGG;WACiB,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAarE;;;OAGG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IAiBpD;;;;;OAKG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IAapD;;;;;OAKG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IAqBpD;;;;;OAKG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAmBtD;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAYtD;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAYtD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAarD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAYrD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAgBrD;;;OAGG;WACiB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB1E;;;OAGG;WACiB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhE;;;OAGG;WACiB,UAAU,CAAC,OAAO,EAAE,WAAW;IAKnD;;;OAGG;WACiB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAa9E;;;OAGG;WACiB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjF;;;OAGG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAaxE;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAazE;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAazE;;;OAGG;WACiB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;WAyBvD,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;WA2BlD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;CAyBzE"}
+{"version":3,"file":"StdLib.d.ts","sourceRoot":"","sources":["../../src/libs/StdLib.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAM3D,MAAM,CAAC,OAAO,OAAO,MAAM;IAEzB,OAAc,WAAW,uCAsBvB;IAEF;;;OAGG;WACiB,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAarE;;;OAGG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IAiBpD;;;;;OAKG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IAapD;;;;;OAKG;WACiB,WAAW,CAAC,OAAO,EAAE,WAAW;IA6BpD;;;;;OAKG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAmBtD;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAYtD;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW;IAYtD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAarD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAYrD;;;;;OAKG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW;IAgBrD;;;OAGG;WACiB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB1E;;;OAGG;WACiB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhE;;;OAGG;WACiB,UAAU,CAAC,OAAO,EAAE,WAAW;IAKnD;;;OAGG;WACiB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAa9E;;;OAGG;WACiB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjF;;;OAGG;WACiB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAaxE;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAazE;;;OAGG;WACiB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAazE;;;OAGG;WACiB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;WAyBvD,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;WA2BlD,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;CAyBzE"}

package/bin/libs/StdLib.js

@@ -89,14 +89,27 @@ export default class StdLib {
     static async elemHasText(stepCtx) {
         return await uiWrapper(stepCtx, async (stepCtx, elem) => {
             try {
-                const text = await elem.innerText();
-                let pattern = stepCtx.getStringParam('0');
+                const isInput = await elem.evaluate((el) => el.tagName === 'INPUT');
+                const text = isInput ? await elem.inputValue() : await elem.innerText();
+                const pattern = stepCtx.getStringParam('0');
                 if (stepCtx.getParam('1', false) === true) {
-                    pattern = `^${pattern}$`;
+                    if (pattern === text) {
+                        return true;
+                    }
+                    else {
+                        report.error(`Expected >${pattern}< and obtained >${text}< are not exactly the same`);
+                        return false;
+                    }
+                }
+                else {
+                    if (text.includes(pattern)) {
+                        return true;
+                    }
+                    else {
+                        report.error(`Expected >${pattern}< not found in obtained >${text}<`);
+                        return false;
+                    }
                 }
-                const regex = new RegExp(pattern);
-                const found = text.match(regex);
-                return !!found;
             }
             catch (e) {
                 report.warning(`Playwright error on 'HasText' instruction : ${e.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kogeet/sagent-playwright",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Scapin Agent for Playwright",
   "main": "bin/index.js",
   "publishConfig": {
@@ -18,7 +18,7 @@
   "license": "MIT",
   "dependencies": {
     "@kogeet/sagent-plugin-dataset": "^0.1.4",
-    "@kogeet/scapin-core-agent": "^0.1.8",
+    "@kogeet/scapin-core-agent": "^0.2.0",
     "@playwright/browser-chromium": "^1.58.2",
     "@playwright/browser-firefox": "^1.58.2",
     "@playwright/browser-webkit": "^1.58.2",