@dev-blinq/cucumber_client 1.0.1213-dev → 1.0.1215-dev

package/bin/client/cucumber/steps_definitions.js

@@ -632,4 +632,23 @@ function findFilesWithExtension(folderPath, extension, rootFolder = null) {
 
   return result;
 }
+export function locateDefinitionPath(featureFolder, pageName) {
+  if (!pageName) {
+    return null;
+  }
+  if (!pageName.endsWith("_page.mjs")) {
+    pageName = pageName + "_page.mjs";
+  }
+  // search for files with the pageName
+  const stepDefinitionFolderPath = path.join(featureFolder, "step_definitions");
+  const files = findFilesWithExtension(stepDefinitionFolderPath, "mjs");
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    if (file.includes(pageName)) {
+      return path.join(stepDefinitionFolderPath, file);
+    }
+  }
+  return path.join(stepDefinitionFolderPath, pageName);
+}
+
 export { StepsDefinitions, findFilesWithExtension };

package/bin/client/project.js

@@ -4,6 +4,7 @@ import { CodePage } from "./code_gen/page_reflection.js";
 import logger from "../logger.js";
 import path from "path";
 import { fileURLToPath } from "url";
+import { findFilesWithExtension } from "./cucumber/steps_definitions.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -85,7 +86,10 @@ class Project {
       logger.error("Error loading utils_template");
     }
 
-    let files = readdirSync(this.stepsFolder);
+    const files = findFilesWithExtension(this.stepsFolder, "mjs");
+
+    //let files = readdirSync(this.stepsFolder);
+
     for (let i = 0; i < files.length; i++) {
       let file = files[i];
       if (file.startsWith("_")) {

package/bin/client/recorderv3/step_runner.js

@@ -11,6 +11,7 @@ import {
   saveRecording,
 } from "./step_utils.js";
 import { escapeString, getExamplesContent } from "./update_feature.js";
+import { locateDefinitionPath } from "../cucumber/steps_definitions.js";
 
 // let copiedCodeToTemp = false;
 async function withAbort(fn, signal) {
@@ -96,7 +97,8 @@ export class BVTStepRunner {
       if (!existsSync(stepDefinitionFolderPath)) {
         mkdirSync(stepDefinitionFolderPath, { recursive: true });
       }
-      const stepDefsFilePath = path.join(stepDefinitionFolderPath, pageName + "_page.mjs");
+      const stepDefsFilePath = locateDefinitionPath(tempFolderPath, pageName);
+      //path.join(stepDefinitionFolderPath, pageName + "_page.mjs");
       codePage = getCodePage(stepDefsFilePath);
       codePage = await saveRecording({ step, cucumberStep, codePage, projectDir: this.projectDir, stepsDefinitions });
       if (codePage) {

package/bin/client/recorderv3/step_utils.js

@@ -6,7 +6,7 @@ import { CodePage } from "../code_gen/page_reflection.js";
 import { generateCode, generatePageName } from "../code_gen/playwright_codeget.js";
 import { invertCodeToCommand } from "../code_gen/code_inversion.js";
 import { Step } from "../cucumber/feature.js";
-import { StepsDefinitions } from "../cucumber/steps_definitions.js";
+import { locateDefinitionPath, StepsDefinitions } from "../cucumber/steps_definitions.js";
 import { Recording } from "../recording.js";
 import { generateApiCode } from "../code_gen/api_codegen.js";
 
@@ -299,6 +299,7 @@ export async function updateStepDefinitions({ scenario, featureName, projectDir
   const steps = scenario.steps;
 
   const stepsDefinitions = new StepsDefinitions(projectDir);
+  const featureFolder = path.join(projectDir, "features");
   stepsDefinitions.load(false);
   // const parameters = scenario.parameters;
   // await saveRecordings({ steps, parameters, codePage, projectDir });
@@ -314,7 +315,8 @@ export async function updateStepDefinitions({ scenario, featureName, projectDir
     }
     const cucumberStep = getCucumberStep({ step });
     const pageName = generatePageName(step.startFrame?.url ?? "default");
-    const stepDefsFilePath = path.join(stepDefinitionFolderPath, pageName + "_page.mjs");
+    const stepDefsFilePath = locateDefinitionPath(featureFolder, pageName);
+    // path.join(stepDefinitionFolderPath, pageName + "_page.mjs");
     let codePage = getCodePage(stepDefsFilePath);
 
     codePage = await saveRecording({ step, cucumberStep, codePage, projectDir, stepsDefinitions });

package/bin/client/run_cucumber.js

@@ -396,6 +396,7 @@ const runCucumber = async (
         logger.error(e.stack);
         message = e.message + "\n" + e.stack;
       }
+      aiAgent.scenarioReport.updateLastCommand({ status: false, error: message });
       // Write logs to file on error
       const logsFilePath = path.join(result.scenarioPath, "editorLogs.log");
       writeLogsToFile(logsFilePath);

package/package.json

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