@dev-blinq/cucumber_client 1.0.1678-dev → 1.0.1679-dev

package/bin/client/code_gen/playwright_codeget.js

@@ -375,7 +375,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
       codeLines.push(escapeNonPrintables(comment));
       line = `const frameLocator = ${JSON.stringify(step.selectors ?? null)}`;
       codeLines.push(line);
-      line = `await context.web.snapshotValidation(frameLocator, _param_0 , _params, ${JSON.stringify(options)}, this);`;
+      line = `await context.web.snapshotValidation(frameLocator,${step.valueInStepText ? "_param_0" : `"${step.parameters[0]}"`}, _params, ${JSON.stringify(options)}, this);`;
       codeLines.push(line);
 
       const data = step.data;
@@ -666,7 +666,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
     case Types.VERIFY_PROPERTY: {
       line = `await context.web.verifyProperty(elements["${elementIdentifier}"], `;
-      input = "_param_0";
+      input = step.valueInStepText ? "_param_0" : `"${escapeNonPrintables(step.parameters[1].replaceAll('"', '\\"'))}"`;
       if (step.dataSource === "userData" || step.dataSource === "parameters") {
         input = "_" + step.dataKey;
       }
@@ -676,7 +676,7 @@ const _generateCodeFromCommand = (step, elements, userData) => {
     }
     case Types.CONDITIONAL_WAIT: {
       line = `await context.web.conditionalWait(elements["${elementIdentifier}"], `;
-      input = "_param_0";
+      input = step.valueInStepText ? "_param_0" : `"${escapeNonPrintables(step.parameters[1].replaceAll('"', '\\"'))}"`;
       line += `"${step.parameters[1]}", ${input}, _params, null, this);`;
       codeLines.push(line);
       break;
@@ -706,22 +706,6 @@ const _generateCodeFromCommand = (step, elements, userData) => {
   return { codeLines, elements: elementsChanged ? elements : null, elementIdentifier, allStrategyLocators };
 };
 
-/**
- * Generates a report command based on the given position.
- * @param {"start"|"end"} position
- */
-const generateReportCommand = (position, cmdId) => {
-  const codeLines = [];
-  if (position === "start") {
-    const line = `await context.web.addCommandToReport("${cmdId}", "PASSED", '{"status":"start","cmdId":"${cmdId}"}', {type:"cmdReport"},this);`;
-    codeLines.push(line);
-  } else if (position === "end") {
-    const line = `await context.web.addCommandToReport("${cmdId}", "PASSED", '{"status":"end","cmdId":"${cmdId}"}', {type:"cmdReport"},this);`;
-    codeLines.push(line);
-  }
-  return codeLines;
-};
-
 const generateCode = (recording, codePage, userData, projectDir, methodName) => {
   const stepsDefinitions = new StepsDefinitions(projectDir);
   stepsDefinitions.load(false);

package/bin/client/recorderv3/step_utils.js

@@ -48,7 +48,7 @@ const replaceLastOccurence = (str, search, replacement) => {
   return str.substring(0, lastIndex) + replacement + str.substring(lastIndex + search.length);
 };
 
-const _toRecordingStep = (cmd) => {
+const _toRecordingStep = (cmd, stepText) => {
   switch (cmd.type) {
     case "hover_element": {
       return {
@@ -250,6 +250,7 @@ const _toRecordingStep = (cmd) => {
         },
         parameters: [cmd.selectedField, cmd.value],
         lastKnownUrlPath: cmd.lastKnownUrlPath,
+        valueInStepText: stepText && typeof stepText === "string" ? stepText.includes(`"${cmd.value}"`) : false,
       };
     }
     case "conditional_wait": {
@@ -261,6 +262,7 @@ const _toRecordingStep = (cmd) => {
         },
         parameters: [cmd.timeout, cmd.selectedField, cmd.value],
         lastKnownUrlPath: cmd.lastKnownUrlPath,
+        valueInStepText: stepText && typeof stepText === "string" ? stepText.includes(`"${cmd.value}"`) : false,
       };
     }
     case "navigate": {
@@ -297,6 +299,7 @@ const _toRecordingStep = (cmd) => {
         parameters: [cmd.value],
         selectors: cmd.selectors,
         data: cmd.data,
+        valueInStepText: stepText && typeof stepText === "string" ? stepText.includes(`"${cmd.value}"`) : false,
       };
     }
     default: {
@@ -360,14 +363,14 @@ const parameterizeLocators = ({ cmd, locs, isValueVariable, isTargetValueVariabl
 };
 
 //TODO: IMPORTAN
-export const toRecordingStep = (cmd, parametersMap) => {
+export const toRecordingStep = (cmd, parametersMap, stepText) => {
   if (cmd.type === "api") {
     return {
       type: "api",
       value: cmd.value,
     };
   }
-  const step = _toRecordingStep(cmd);
+  const step = _toRecordingStep(cmd, stepText);
   const cmdID = {
     cmdId: cmd.id,
   };
@@ -494,7 +497,7 @@ function makeStepTextUnique(step, stepsDefinitions) {
 
 export async function saveRecording({ step, cucumberStep, codePage, projectDir, stepsDefinitions, parametersMap }) {
   if (step.commands && Array.isArray(step.commands)) {
-    step.commands = step.commands.map((cmd) => toRecordingStep(cmd, parametersMap));
+    step.commands = step.commands.map((cmd) => toRecordingStep(cmd, parametersMap, step.text));
   }
   let routesPath = path.join(tmpdir(), "blinq_temp_routes");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1678-dev",
+  "version": "1.0.1679-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",