@dev-blinq/cucumber_client 1.0.1221-dev → 1.0.1223-dev

package/bin/assets/preload/recorderv3.js

@@ -459,7 +459,7 @@ class BVTRecorder {
       getAction: (e) => {
         consumeEvent(e);
       },
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -474,7 +474,7 @@ class BVTRecorder {
         };
       },
       getAction: () => null,
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -489,7 +489,7 @@ class BVTRecorder {
         };
       },
       getAction: () => null,
-      getInterestedElement: () => {},
+      getInterestedElement: () => { },
       hoverOutlineStyle: "",
     });
 
@@ -928,6 +928,8 @@ class BVTRecorder {
       // }
 
       lastInputId = el.dataset.inputId;
+
+      el.__locators = this.getLocatorsObject(el);
     }
     const role = window.getAriaRole(el);
     const label = window.getElementAccessibleName(el, false) || window.getElementAccessibleName(el, true) || role || "";
@@ -1218,7 +1220,8 @@ class BVTRecorder {
             action: action.details,
             element: this.getElementDetails(actionElement, eventName),
             isPopupCloseClick: this.isPopupCloseEvent(e),
-            ...this.getLocatorsObject(actionElement),
+            // ...this.getLocatorsObject(actionElement),
+            ...(actionElement.__locators ?? this.getLocatorsObject(actionElement)),
             frame: this.getFrameDetails(),
             statistics: {
               time: `${performance.measure("command-received", "command-send").duration.toFixed(2)} ms`,

package/bin/assets/preload/unique_locators.js

@@ -29,6 +29,8 @@ const getMatchingElements = (selector, options = {}) => {
   return window.__injectedScript.querySelectorAll(window.__injectedScript.parseSelector(selector), root);
 };
 
+window.getMatchingElements = getMatchingElements;
+
 const getPWSelectors = (element, options = {}) => {
   const selectors = [];
   const exludeText = options?.excludeText || false;
@@ -147,7 +149,25 @@ const getElementLocators = (element, options) => {
     .map((item) => {
       return item;
     });
-
+  if (result.nonUnique.length === 0) {
+    // find slector with min score
+    let minScore = Infinity;
+    let minSelector = null;
+    for (const locator of pw_locators) {
+      if (locator.score < minScore) {
+        minScore = locator.score;
+        minSelector = locator.selector;
+      }
+    }
+    if (minSelector) {
+      result.nonUnique.push({
+        css: minSelector,
+        priority: 2,
+        elements: getMatchingElements(minSelector, options),
+        score: minScore,
+      });
+    }
+  }
   return result;
 };
 

package/bin/client/code_gen/code_inversion.js

@@ -384,7 +384,6 @@ const invertStableCommand = (call, elements, stepParams) => {
       }
       break;
     }
-
     case "snapshotValidation": {
       step.type = Types.VERIFY_PAGE_SNAPSHOT;
       const inputParam = parseDataSource(call.arguments[1], stepParams);
@@ -394,6 +393,30 @@ const invertStableCommand = (call, elements, stepParams) => {
       step.selectors = call.arguments[0].value;
       break;
     }
+    case "verifyPageTitle": {
+      step.type = Types.VERIFY_PAGE_TITLE;
+      const text = parseDataSource(call.arguments[0], stepParams);
+      if (text.type === "literal") {
+        step.parameters = [text.value];
+      } else {
+        step.dataSource = text.dataSource;
+        step.dataKey = text.dataKey;
+        step.parameters = [toVariableName(text.dataKey)];
+      }
+      break;
+    }
+    case "verifyPagePath": {
+      step.type = Types.VERIFY_PAGE_PATH;
+      const path = parseDataSource(call.arguments[0], stepParams);
+      if (path.type === "literal") {
+        step.parameters = [path.value];
+      } else {
+        step.dataSource = path.dataSource;
+        step.dataKey = path.dataKey;
+        step.parameters = [toVariableName(path.dataKey)];
+      }
+      break;
+    }
     default:
       return; // Skip if no matching method
   }

package/bin/client/recorderv3/bvt_recorder.js

@@ -198,6 +198,7 @@ export class BVTRecorder {
     this.logger = logger;
     this.screenshotMap = new Map();
     this.snapshotMap = new Map();
+    this.scenariosStepsMap = new Map();
     this.namesService = new NamesService({
       screenshotMap: this.screenshotMap,
       TOKEN: this.TOKEN,
@@ -751,10 +752,26 @@ export class BVTRecorder {
     await this.cleanup();
   }
   async getImplementedSteps() {
-    return getImplementedSteps(this.projectDir);
+    const stepsAndScenarios = await getImplementedSteps(this.projectDir);
+    const implementedSteps = stepsAndScenarios.implementedSteps;
+    const scenarios = stepsAndScenarios.scenarios;
+    for (const scenario of scenarios) {
+      this.scenariosStepsMap.set(scenario.name, scenario.steps);
+      delete scenario.steps;
+    }
+    return {
+      implementedSteps,
+      scenarios,
+    };
   }
   async getStepsAndCommandsForScenario({ name, featureName }) {
-    return getStepsAndCommandsForScenario({ name, featureName, projectDir: this.projectDir });
+    return this.scenariosStepsMap.get(name) || [];
+    // return getStepsAndCommandsForScenario({
+    //   name,
+    //   featureName,
+    //   projectDir: this.projectDir,
+    //   map: this.scenariosStepsMap,
+    // });
   }
   async generateStepName({ commands, stepsNames, parameters, map }) {
     return await this.namesService.generateStepName({ commands, stepsNames, parameters, map });

package/bin/client/recorderv3/implemented_steps.js

@@ -233,7 +233,6 @@ export const getImplementedSteps = async (projectDir) => {
     delete scenario.featureText;
     delete scenario.scenarioDocument;
     delete scenario.examples;
-    delete scenario.steps;
     for (const tag of scenario.tags) {
       delete tag.location;
     }
@@ -253,7 +252,7 @@ export const getImplementedSteps = async (projectDir) => {
   return { implementedSteps, scenarios };
 };
 
-export const getStepsAndCommandsForScenario = ({ name, featureName, projectDir }) => {
+export const getStepsAndCommandsForScenario = ({ name, featureName, projectDir, map }) => {
   const stepsDefinitions = new StepsDefinitions(projectDir);
   const step_definitions = loadStepDefinitions(projectDir);
   stepsDefinitions.load();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1221-dev",
+  "version": "1.0.1223-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -28,7 +28,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.172-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.733-dev",
+    "automation_model": "1.0.735-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",