@dev-blinq/cucumber_client 1.0.1293-dev → 1.0.1295-dev

package/bin/client/code_gen/page_reflection.js

@@ -240,13 +240,17 @@ this.imports[2].node.source.value
     }
     return templates;
   }
-  getExpectedTimeout(expectedNumofCmds) {
+  getExpectedTimeout(expectedNumofCmds, finalTimeout) {
+    const timeoutNum = parseFloat(finalTimeout);
+    if (finalTimeout && !isNaN(timeoutNum)) {
+      return -1;
+    }
     return expectedNumofCmds * 60 * 1000;
   }
-  addCucumberStep(type, cucumberLine, method, expectedNumofCmds) {
+  addCucumberStep(type, cucumberLine, method, expectedNumofCmds, finalTimeout) {
     const result = {};
     let code = "\n";
-    code += `${type}(${JSON.stringify(cucumberLine)}, ${expectedNumofCmds ? `{ timeout: ${this.getExpectedTimeout(expectedNumofCmds)}}, ` : ""}${method});\n`;
+    code += `${type}(${JSON.stringify(cucumberLine)}, ${expectedNumofCmds ? `{ timeout: ${this.getExpectedTimeout(expectedNumofCmds, finalTimeout)}}, ` : ""}${method});\n`;
     let existCodePart = null;
     for (let i = 0; i < this.cucumberCalls.length; i++) {
       if (

package/bin/client/cucumber/steps_definitions.js

@@ -525,11 +525,7 @@ class StepsDefinitions {
   };
 
   executeStepRemote = async ({ feature_file_path, scenario, tempFolderPath, stepText }, options) => {
-    if (!options) {
-      options = {
-        skipAfter: true,
-      };
-    }
+    const { skipAfter = true, skipBefore = true } = options || {};
     const environment = {
       ...process.env,
     };
@@ -555,11 +551,16 @@ class StepsDefinitions {
       //   console.log("step", step.pattern);
       // });
 
-      if (options.skipAfter) {
+      if (skipAfter) {
         // ignore afterAll/after hooks
         support.afterTestCaseHookDefinitions = [];
         support.afterTestRunHookDefinitions = [];
       }
+      if (skipBefore) {
+        // ignore beforeAll/before hooks
+        support.beforeTestCaseHookDefinitions = [];
+        support.beforeTestRunHookDefinitions = [];
+      }
 
       let errorMesssage = null;
       let info = null;

package/bin/client/recorderv3/bvt_recorder.js

@@ -789,7 +789,7 @@ export class BVTRecorder {
     }, 100);
     this.timerId = timerId;
   }
-  async runStep({ step, parametersMap, tags }, options) {
+  async runStep({ step, parametersMap, tags, isFirstStep }, options) {
     const _env = {
       TOKEN: this.TOKEN,
       TEMP_RUN: true,
@@ -815,7 +815,7 @@ export class BVTRecorder {
           tags
         },
         this.bvtContext,
-        options
+        options ? { ...options, skipBefore: !isFirstStep } : { skipBefore: !isFirstStep }
       );
       await this.revertMode();
       return { result, info };
@@ -829,11 +829,6 @@ export class BVTRecorder {
       this.bvtContext.navigate = false;
     }
   }
-  async runScenario({ steps, parametersMap, tags }) {
-    for (const step of steps) {
-      await this.runStep({ step, parametersMap, tags });
-    }
-  }
   async saveScenario({ scenario, featureName, override, isSingleStep }) {
     await updateStepDefinitions({ scenario, featureName, projectDir: this.projectDir }); // updates mjs files
     if (!isSingleStep) await updateFeatureFile({ featureName, scenario, override, projectDir: this.projectDir }); // updates gherkin files

package/bin/client/recorderv3/index.js

@@ -139,9 +139,6 @@ const init = ({ envName, projectDir, roomId, TOKEN }) => {
     "recorderWindow.runStep": async (input) => {
       return recorder.runStep(input);
     },
-    "recorderWindow.runScenario": async (input) => {
-      return recorder.runScenario(input);
-    },
     "recorderWindow.saveScenario": async (input) => {
       return recorder.saveScenario(input);
     },

package/bin/client/recorderv3/step_utils.js

@@ -166,7 +166,13 @@ export async function saveRecording({ step, cucumberStep, codePage, projectDir,
       path
     );
     const keyword = (cucumberStep.keywordAlias ?? cucumberStep.keyword).trim();
-    const stepResult = codePage.addCucumberStep(keyword, cucumberStep.getTemplate(), methodName, steps.length);
+    const stepResult = codePage.addCucumberStep(
+      keyword,
+      cucumberStep.getTemplate(),
+      methodName,
+      steps.length,
+      step.finalTimeout
+    );
 
     if (!step.isImplemented) {
       stepsDefinitions.addStep({
@@ -328,7 +334,6 @@ export async function updateStepDefinitions({ scenario, featureName, projectDir
     const stepDefsFilePath = locateDefinitionPath(featureFolder, pageName);
     // path.join(stepDefinitionFolderPath, pageName + "_page.mjs");
     let codePage = getCodePage(stepDefsFilePath);
-
     codePage = await saveRecording({ step, cucumberStep, codePage, projectDir, stepsDefinitions });
     if (!codePage) {
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1293-dev",
+  "version": "1.0.1295-dev",
   "description": "",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -32,7 +32,7 @@
     "@cucumber/tag-expressions": "^6.1.1",
     "@dev-blinq/cucumber-js": "1.0.176-dev",
     "@faker-js/faker": "^8.1.0",
-    "automation_model": "1.0.764-dev",
+    "automation_model": "1.0.765-dev",
     "axios": "^1.7.4",
     "chokidar": "^3.6.0",
     "create-require": "^1.1.1",