k6-cucumber-steps 1.2.15 → 1.2.17

package/bin/k6-cucumber-steps.js

@@ -82,7 +82,7 @@ program
     }
 
     // Determine project root (where your main package.json is)
-    const projectRoot = path.resolve(__dirname, "..");
+    const projectRoot = process.cwd();
 
     // Determine payload directory from CLI or config, always relative to project root
     let payloadDirRaw =
@@ -90,9 +90,8 @@ program
       (cucumberConfig.worldParameters &&
         cucumberConfig.worldParameters.payloadPath) ||
       "payloads";
-    const payloadDir = path.isAbsolute(payloadDirRaw)
-      ? payloadDirRaw
-      : path.join(projectRoot, payloadDirRaw);
+    const payloadDir = path.resolve(projectRoot, payloadDirRaw);
+    console.log("📦 Resolved payload path:", payloadDir);
 
     // Add --world-parameters to CLI args
     const worldParams = {
@@ -109,11 +108,7 @@ program
       cliParts.push("--k6Config", argv.k6Config);
     }
 
-    const finalCommand = [
-      "npx",
-      "cucumber-js",
-      ...cliParts
-    ].join(" ");
+    const finalCommand = ["npx", "cucumber-js", ...cliParts].join(" ");
 
     console.log("▶️ Final arguments passed to cucumber-js:", finalCommand);
 
@@ -121,13 +116,11 @@ program
     const extraEnv = {
       // Priority: cucumberConfig > CLI
       SAVE_K6_SCRIPT:
-        cucumberConfig.saveK6Script === true ||
-        argv.saveK6Script === true
+        cucumberConfig.saveK6Script === true || argv.saveK6Script === true
           ? "true"
           : "false",
       K6_CUCUMBER_OVERWRITE:
-        cucumberConfig.overwrite === true ||
-        argv.overwrite === true
+        cucumberConfig.overwrite === true || argv.overwrite === true
           ? "true"
           : "false",
       CLEAN_REPORTS:
@@ -137,17 +130,14 @@ program
           ? "true"
           : "false",
       K6_CUCUMBER_REPORTER:
-        cucumberConfig.reporter === true ||
-        argv.reporter === true
+        cucumberConfig.reporter === true || argv.reporter === true
           ? "true"
           : "false",
     };
 
     // Clean reports directory if requested
     const shouldCleanReports =
-      argv.cleanReports ||
-      argv.clean ||
-      cucumberConfig.cleanReports;
+      argv.cleanReports || argv.clean || cucumberConfig.cleanReports;
 
     if (shouldCleanReports) {
       const reportsDir = path.join(projectRoot, "reports");
@@ -158,14 +148,10 @@ program
     }
 
     // Now spawn the process
-    const cucumberProcess = spawn(
-      "npx",
-      ["cucumber-js", ...cliParts],
-      {
-        stdio: "inherit",
-        env: { ...process.env, ...extraEnv },
-      }
-    );
+    const cucumberProcess = spawn("npx", ["cucumber-js", ...cliParts], {
+      stdio: "inherit",
+      env: { ...process.env, ...extraEnv },
+    });
 
     cucumberProcess.on("close", async (code) => {
       if (code === 0) {

package/lib/helpers/resolvePayloadPath.js

@@ -0,0 +1,25 @@
+import path from "path";
+import fs from "fs";
+
+/**
+ * Resolves the full path to a payload file based on a root directory (e.g., from config)
+ * and filename. Throws a clear error if file does not exist.
+ *
+ * @param {string} fileName - The file name (e.g., login.json)
+ * @param {string} payloadDir - Directory path for payloads (absolute or relative)
+ * @returns {string} - Full path to the resolved file
+ */
+export default function resolvePayloadPath(fileName, payloadDir = "payloads") {
+  const projectRoot = path.resolve(process.cwd());
+  const baseDir = path.isAbsolute(payloadDir)
+    ? payloadDir
+    : path.join(projectRoot, payloadDir);
+
+  const fullPath = path.join(baseDir, fileName);
+
+  if (!fs.existsSync(fullPath)) {
+    throw new Error(`❌ Payload file not found: "${fullPath}"`);
+  }
+
+  return fullPath;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k6-cucumber-steps",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "main": "index.js",
   "license": "MIT",
   "repository": {

package/step_definitions/load_test_steps.js

@@ -5,7 +5,7 @@ import fs from "fs";
 import path from "path";
 import crypto from "crypto";
 import * as dotenv from "dotenv";
-
+import resolvePayloadPath from "../lib/helpers/resolvePayloadPath.js";
 import resolveBody from "../lib/helpers/resolveBody.js";
 import buildK6Script from "../lib/helpers/buildK6Script.js";
 import generateHeaders from "../lib/helpers/generateHeaders.js";
@@ -293,19 +293,58 @@ export async function When_I_set_method_body_for_endpoint(
   docString
 ) {
   /** @type {CustomWorld} */ (this);
-  this.config.method = method.toUpperCase();
-  this.config.endpoint = endpoint;
-  this.config.body = resolveBody(docString, process.env);
+  const methodUpper = method.toUpperCase();
+  const payloadDir = this.parameters?.payloadPath || "payloads";
+  const doc = docString.trim();
+
+  let body = "";
+
+  // Try resolving from file if it looks like a filename
+  const isLikelyFile = /^[\w\-.]+(\.json)?$/.test(doc);
+  const fileName = doc.endsWith(".json") ? doc : `${doc}.json`;
+
+  try {
+    if (isLikelyFile) {
+      const filePath = resolvePayloadPath(fileName, payloadDir);
+      const fileContent = fs.readFileSync(filePath, "utf-8");
+      body = resolveBody(fileContent, {
+        ...process.env,
+        ...(this.aliases || {}),
+      });
+      this.log?.(`📁 Loaded payload from file: "${fileName}"`);
+    } else {
+      throw new Error("Skipping file load; using raw input as body.");
+    }
+  } catch (e) {
+    // If file doesn't exist or error occurs, treat as inline string
+    body = resolveBody(doc, {
+      ...process.env,
+      ...(this.aliases || {}),
+    });
+    this.log?.("📝 Using docString directly as payload body.");
+  }
+
+  this.config = {
+    ...(this.config || {}),
+    method: methodUpper,
+    endpoint,
+    body,
+    headers: this.config?.headers || {},
+  };
+
+  this.lastRequest = {
+    method: methodUpper,
+    endpoint,
+    body,
+  };
+
   this.log?.(
-    `⚙️ Body set for ${this.config.method} to "${
-      this.config.endpoint
-    }". Body preview: ${this.config.body.slice(0, 100)}...`
+    `⚙️ Body set for ${methodUpper} to "${endpoint}". Body preview: ${body.slice(
+      0,
+      100
+    )}...`
   );
 }
-When(
-  /^I set the following (\w+) body is used for "([^"]+)"$/,
-  When_I_set_method_body_for_endpoint
-);
 
 /**
  * Loads a JSON payload from a file to be used as the request body for a specific
@@ -346,15 +385,8 @@ export async function When_I_use_JSON_payload_from_file_for_method_to_endpoint(
     );
   }
 
-  const projectRoot = path.resolve(__dirname, "..", "..");
   const payloadDir = this.parameters?.payloadPath || "payloads";
-  const payloadPath = path.isAbsolute(payloadDir)
-    ? path.join(payloadDir, fileName)
-    : path.join(projectRoot, payloadDir, fileName);
-
-  if (!fs.existsSync(payloadPath)) {
-    throw new Error(`Payload file not found: "${payloadPath}"`);
-  }
+  const payloadPath = resolvePayloadPath(fileName, payloadDir);
 
   const rawTemplate = fs.readFileSync(payloadPath, "utf-8");
   const resolved = resolveBody(rawTemplate, {
@@ -504,14 +536,7 @@ export async function When_I_login_via_POST_with_payload_from_file(
 ) {
   /** @type {CustomWorld} */ (this);
   const payloadDir = this.parameters?.payloadPath || "payloads";
-  const projectRoot = path.resolve(__dirname, "..", "..");
-  const payloadPath = path.isAbsolute(payloadDir)
-    ? path.join(payloadDir, fileName)
-    : path.join(projectRoot, payloadDir, fileName);
-
-  if (!fs.existsSync(payloadPath)) {
-    throw new Error(`Payload file not found: "${payloadPath}"`);
-  }
+  const payloadPath = resolvePayloadPath(fileName, payloadDir);
 
   const rawTemplate = fs.readFileSync(payloadPath, "utf-8");
   const resolved = resolveBody(rawTemplate, {