@dev-blinq/cucumber_client 1.0.1319-dev → 1.0.1321-dev

package/bin/client/code_gen/playwright_codeget.js

@@ -731,9 +731,9 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
       return;
     }
 
-    if (process.env.TEMP_RUN === "true") {
-      codeLines.push(...generateReportCommand("start", recordingStep.cmdId));
-    }
+    // if (process.env.TEMP_RUN === "true") {
+    //   codeLines.push(...generateReportCommand("start", recordingStep.cmdId));
+    // }
     const result = _generateCodeFromCommand(recordingStep, elements, userData);
     if (process.env.TEMP_RUN) {
       // Add try catch block to the generated code, should attach commandId to world object
@@ -743,9 +743,9 @@ const generateCode = (recording, codePage, userData, projectDir, methodName) =>
       );
     }
     codeLines.push(...result.codeLines);
-    if (process.env.TEMP_RUN === "true") {
-      codeLines.push(...generateReportCommand("end", recordingStep.cmdId));
-    }
+    // if (process.env.TEMP_RUN === "true") {
+    //   codeLines.push(...generateReportCommand("end", recordingStep.cmdId));
+    // }
     if (result.elements) {
       elements = result.elements;
     }

package/bin/client/recorderv3/bvt_recorder.js

@@ -190,16 +190,16 @@ export class BVTRecorder {
         if (data && data.type) {
           switch (data.type) {
             case "cmdExecutionStart":
-              console.log("Sending cmdExecutionStart event for cmdId:", data.cmdId);
-              this.sendEvent(this.events.cmdExecutionStart, data.cmdId);
+              console.log("Sending cmdExecutionStart event for cmdId:", data);
+              this.sendEvent(this.events.cmdExecutionStart, data);
               break;
             case "cmdExecutionSuccess":
-              console.log("Sending cmdExecutionSuccess event for cmdId:", data.cmdId);
-              this.sendEvent(this.events.cmdExecutionSuccess, data.cmdId);
+              console.log("Sending cmdExecutionSuccess event for cmdId:", data);
+              this.sendEvent(this.events.cmdExecutionSuccess, data);
               break;
             case "cmdExecutionFailure":
-              console.log("Sending cmdExecutionFailure event for cmdId:", data.cmdId);
-              this.sendEvent(this.events.cmdExecutionFailure, data.cmdId);
+              console.log("Sending cmdExecutionFailure event for cmdId:", data);
+              this.sendEvent(this.events.cmdExecutionFailure, data);
               break;
             default:
               console.warn("Unknown command execution status type:", data.type);
@@ -211,7 +211,7 @@ export class BVTRecorder {
     this.pageSet = new Set();
     this.lastKnownUrlPath = "";
     // TODO: what is world?
-    this.world = { attach: () => {} };
+    this.world = { attach: () => { } };
     this.shouldTakeScreenshot = true;
     this.watcher = null;
   }
@@ -319,7 +319,7 @@ export class BVTRecorder {
     process.env.CDP_LISTEN_PORT = this.#remoteDebuggerPort;
 
     this.stepRunner.setRemoteDebugPort(this.#remoteDebuggerPort);
-    this.world = { attach: () => {} };
+    this.world = { attach: () => { } };
 
     const ai_config_file = path.join(this.projectDir, "ai_config.json");
     let ai_config = {};
@@ -725,7 +725,7 @@ export class BVTRecorder {
   }
   async closeBrowser() {
     delete process.env.TEMP_RUN;
-    await this.watcher.close().then(() => {});
+    await this.watcher.close().then(() => { });
     this.watcher = null;
     this.previousIndex = null;
     this.previousHistoryLength = null;

package/bin/client/recorderv3/step_runner.js

@@ -132,7 +132,7 @@ export class BVTStepRunner {
           }
           if (testStepResult.status === "UNDEFINED") {
             if (!errorMesssage) {
-              errorMesssage = `step ${JSON.stringify(stepText)} is ${testStepResult.status}`;
+              errorMesssage = stepText ? `step ${JSON.stringify(stepText)} is ${testStepResult.status}` : testStepResult.message;
               if (info) {
                 errInfo = info;
               }
@@ -144,33 +144,46 @@ export class BVTStepRunner {
           if (attachment.mediaType === "application/json" && attachment.body) {
             const body = JSON.parse(attachment.body);
             info = body.info;
+            const result = body.result;
 
-            if (body && body.payload) {
-              const payload = body.payload;
-              const content = payload.content;
-              const type = payload.type;
-              if (type === "cmdReport") {
-                if (content) {
-                  const report = JSON.parse(content);
-                  switch (report.status) {
-                    case "start":
-                      this.sendExecutionStatus({
-                        type: "cmdExecutionStart",
-                        cmdId: report.cmdId,
-                      });
-                      break;
-                    case "end":
-                      this.sendExecutionStatus({
-                        type: "cmdExecutionSuccess",
-                        cmdId: report.cmdId,
-                      });
-                      break;
-                    default:
-                      console.warn("Unknown command report status:", report.status);
-                  }
-                }
-              }
+            if (result.status === "PASSED") {
+              this.sendExecutionStatus({
+                type: "cmdExecutionSuccess",
+                cmdId: body.cmdId,
+              });
+            } else {
+              this.sendExecutionStatus({
+                type: "cmdExecutionError",
+                cmdId: body.cmdId,
+                error: result.error,
+              });
             }
+            // if (body && body.payload) {
+            //   const payload = body.payload;
+            //   const content = payload.content;
+            //   const type = payload.type;
+            //   if (type === "cmdReport") {
+            //     if (content) {
+            //       const report = JSON.parse(content);
+            //       switch (report.status) {
+            //         case "start":
+            //           this.sendExecutionStatus({
+            //             type: "cmdExecutionStart",
+            //             cmdId: report.cmdId,
+            //           });
+            //           break;
+            //         case "end":
+            //           this.sendExecutionStatus({
+            //             type: "cmdExecutionSuccess",
+            //             cmdId: report.cmdId,
+            //           });
+            //           break;
+            //         default:
+            //           console.warn("Unknown command report status:", report.status);
+            //       }
+            //     }
+            //   }
+            // }
           }
         }
       });
@@ -191,6 +204,20 @@ export class BVTStepRunner {
   };
 
   async runStep({ step, parametersMap, envPath, tags }, bvtContext, options) {
+    let cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId);
+    if (bvtContext.web) {
+      bvtContext.web.getCmdId = () => {
+        if (cmdIDs.length === 0) {
+          cmdIDs = (step.commands || []).map((cmd) => cmd.cmdId);
+        }
+        const cId = cmdIDs.shift();
+        this.sendExecutionStatus({
+          type: "cmdExecutionStart",
+          cmdId: cId,
+        })
+        return cId;
+      }
+    }
     let codePage; // = getCodePage();
     // const tempFolderPath = process.env.tempFeaturesFolderPath;
     const __temp_features_FolderName = "__temp_features" + Math.random().toString(36).substring(2, 7);
@@ -259,28 +286,28 @@ export class BVTStepRunner {
         }
         saveRoutes({ step, folderPath: routesPath });
       }
-      const feature_file_path = await this.writeTempFeatureFile({ step, parametersMap, tempFolderPath, tags });
-      // console.log({ feature_file_path, step_text: step.text });
-
-      const stepExecController = new AbortController();
-      this.#currentStepController = stepExecController;
-      const { result, info } = await withAbort(async () => {
-        return await stepsDefinitions.executeStepRemote(
-          {
-            feature_file_path,
-            tempFolderPath,
-            stepText: step.text,
-            scenario: "Temp Scenario",
-          },
-          options
-        );
-      }, stepExecController.signal).finally(() => {
-        // rm temp folder
-        if (fs.existsSync(tempFolderPath)) {
-          fs.rmSync(tempFolderPath, { recursive: true });
-        }
-      });
-      return { result, info };
     }
+    const feature_file_path = await this.writeTempFeatureFile({ step, parametersMap, tempFolderPath, tags });
+    // console.log({ feature_file_path, step_text: step.text });
+
+    const stepExecController = new AbortController();
+    this.#currentStepController = stepExecController;
+    const { result, info } = await withAbort(async () => {
+      return await stepsDefinitions.executeStepRemote(
+        {
+          feature_file_path,
+          tempFolderPath,
+          stepText: step.text,
+          scenario: "Temp Scenario",
+        },
+        options
+      );
+    }, stepExecController.signal).finally(() => {
+      // rm temp folder
+      if (fs.existsSync(tempFolderPath)) {
+        fs.rmSync(tempFolderPath, { recursive: true });
+      }
+    });
+    return { result, info };
   }
 }

package/package.json

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