k6-cucumber-steps 1.0.32 → 1.0.33

package/bin/k6-cucumber-steps.js

@@ -6,7 +6,6 @@ const { spawn } = require("child_process");
 const yargs = require("yargs");
 require("dotenv").config();
 
-// 🚀 Welcome Message
 console.log(`
   -----------------------------------------
   🚀 Starting k6-cucumber-steps execution...
@@ -50,22 +49,15 @@ const configFileName =
   argv.configFile || process.env.CUCUMBER_CONFIG_FILE || "cucumber.js";
 const configFilePath = path.resolve(process.cwd(), configFileName);
 
-console.log(`🔍 Looking for config file: ${configFileName}`);
-console.log(`📁 Resolved config file path: ${configFilePath}`);
-
 let configOptions = {};
 if (fs.existsSync(configFilePath)) {
-  console.log("✅ Config file found, including in cucumber arguments...");
   cucumberArgs.push("--config", configFileName);
-
   try {
     const loadedConfig = require(configFilePath);
     configOptions = loadedConfig.default || loadedConfig;
-  } catch (err) {
-    console.warn("⚠️  Failed to load options from config file.");
+  } catch {
+    console.warn("⚠️  Could not load config file");
   }
-} else {
-  console.warn("⚠️  Config file not found, skipping...");
 }
 
 // Tags
@@ -74,66 +66,69 @@ if (tags) {
   cucumberArgs.push("--tags", tags);
 }
 
-// Feature file(s)
-const feature = argv.feature || process.env.FEATURE_PATH;
-if (feature) {
-  cucumberArgs.push(path.resolve(process.cwd(), feature));
+// Feature path(s)
+let featureFiles = [];
+if (argv.feature) {
+  featureFiles.push(path.resolve(argv.feature));
 } else if (configOptions.paths && configOptions.paths.length > 0) {
-  cucumberArgs.push(...configOptions.paths);
+  featureFiles.push(...configOptions.paths);
+}
+if (featureFiles.length > 0) {
+  cucumberArgs.push(...featureFiles);
 }
 
-// Reporting
+// Require default step definitions
+const defaultStepsPath = path.resolve(
+  process.cwd(),
+  "node_modules",
+  "k6-cucumber-steps",
+  "step_definitions"
+);
+cucumberArgs.push("--require", defaultStepsPath);
+
+// Also require additional custom step definitions from config, if any
+if (configOptions.require && Array.isArray(configOptions.require)) {
+  for (const reqPath of configOptions.require) {
+    cucumberArgs.push("--require", reqPath);
+  }
+}
+
+// Determine base report name
 const reportsDir = path.join(process.cwd(), "reports");
 const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
 
-const shouldGenerateReports = argv.reporter || configOptions.reporter || false;
+let baseReportName = "load-results";
+if (featureFiles.length === 1) {
+  const nameFromFeature = path.basename(featureFiles[0], ".feature");
+  baseReportName = nameFromFeature || baseReportName;
+} else if (featureFiles.length > 1) {
+  baseReportName = "multi-feature";
+}
 
+const shouldGenerateReports = argv.reporter || configOptions.reporter || false;
 const shouldOverwrite =
   argv.overwrite ||
   process.env.K6_CUCUMBER_OVERWRITE === "true" ||
   configOptions.overwrite === true;
 
-// Build base names from feature file(s)
-let baseNames = [];
+let reportJsonPath = path.join(reportsDir, `${baseReportName}.json`);
+let reportHtmlPath = path.join(reportsDir, `${baseReportName}.html`);
 
-if (feature) {
-  baseNames = [path.basename(feature, path.extname(feature))];
-} else if (configOptions.paths && configOptions.paths.length > 0) {
-  baseNames = configOptions.paths.map((p) => path.basename(p, path.extname(p)));
-} else {
-  baseNames = ["load-results"];
+if (!shouldOverwrite) {
+  reportJsonPath = path.join(reportsDir, `${baseReportName}-${timestamp}.json`);
+  reportHtmlPath = path.join(reportsDir, `${baseReportName}-${timestamp}.html`);
 }
 
-// Generate report paths
-const reportPaths = baseNames.map((base) => {
-  const jsonName = shouldOverwrite
-    ? `${base}.json`
-    : `${base}-${timestamp}.json`;
-  const htmlName = shouldOverwrite
-    ? `${base}.html`
-    : `${base}-${timestamp}.html`;
-
-  return {
-    json: path.join(reportsDir, jsonName),
-    html: path.join(reportsDir, htmlName),
-  };
-});
+const formatInConfig =
+  Array.isArray(configOptions.format) && configOptions.format.length > 0;
 
-// Inject report formats into cucumber arguments
-if (shouldGenerateReports) {
+if (shouldGenerateReports && !formatInConfig) {
   fs.mkdirSync(reportsDir, { recursive: true });
-
-  cucumberArgs.push("--format", "summary");
-
-  reportPaths.forEach(({ json, html }) => {
-    cucumberArgs.push("--format", `json:${json}`);
-    cucumberArgs.push("--format", `html:${html}`);
-  });
+  cucumberArgs.push("--format", `summary`);
+  cucumberArgs.push("--format", `json:${reportJsonPath}`);
+  cucumberArgs.push("--format", `html:${reportHtmlPath}`);
 }
 
-console.log("📝 Reporter Enabled:", shouldGenerateReports);
-console.log("📝 Overwrite Enabled:", shouldOverwrite);
-
 console.log("\n▶️ Final arguments passed to cucumber-js:");
 console.log(["npx", ...cucumberArgs].join(" ") + "\n");
 
@@ -143,9 +138,9 @@ const cucumberProcess = spawn("npx", cucumberArgs, {
     ...process.env,
     K6_CUCUMBER_OVERWRITE: shouldOverwrite ? "true" : "false",
     TAGS: tags,
-    FEATURE_PATH: feature,
-    REPORT_JSON_PATH: reportPaths[0]?.json,
-    REPORT_HTML_PATH: reportPaths[0]?.html,
+    FEATURE_PATH: featureFiles.join(","),
+    REPORT_JSON_PATH: reportJsonPath,
+    REPORT_HTML_PATH: reportHtmlPath,
   },
 });
 

package/index.js

@@ -1,24 +1 @@
-// Import necessary modules
-const buildK6Script = require("./libs/helpers/buildK6Script");
-const generateHeaders = require("./libs/helpers/generateHeaders");
-const resolveBody = require("./libs/helpers/resolveBody");
-const {
-  generateK6Script: generateTempK6Script,
-  runK6Script,
-} = require("./libs/utils/k6Runner");
-
-// Export the main functionalities of the package
-module.exports = {
-  // Helper functions
-  buildK6Script,
-  generateHeaders,
-  resolveBody,
-
-  // k6 script generation and execution utilities
-  generateK6Script: generateTempK6Script,
-  runK6Script,
-
-  // Step definitions (optional, if users need direct access)
-  stepDefinitions: require("./step_definitions/load_test_steps"),
-};
 export * from "./step_definitions/load_test_steps.js";

package/package.json

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