@elench/testkit 0.1.19 → 0.1.20

package/README.md

@@ -5,11 +5,11 @@ CLI that reads `runner.manifest.json` plus `testkit.config.json` from a product
 ## Prerequisites
 
 ```bash
-sudo snap install k6
 sudo apt-get install -y jq
 ```
 
-For DAL suites, `@elench/testkit` ships its own `k6` SQL binary.
+`@elench/testkit` ships its own `k6` binary and uses it for both HTTP and DAL suites by default.
+If you need to force a different binary, set `TESTKIT_K6_BIN` to an absolute or relative path.
 
 Database isolation uses Docker-managed local Postgres containers. `testkit` creates and reuses template databases automatically, then clones per-worker databases from those templates for fast reruns. The default image is `pgvector/pgvector:pg16`.
 
@@ -77,6 +77,12 @@ const suite = defineHttpSuite({ auth: clerkSessionAuth }, ({ req, setupData }) =
 `testkit` bundles these imports before invoking k6, so tests do not need
 generated `_testkit` files or direct package-manager path imports.
 
+If you need to override the packaged `k6` binary for local environment reasons:
+
+```bash
+TESTKIT_K6_BIN=/path/to/k6 npx @elench/testkit int
+```
+
 Legacy compatibility:
 
 - `testkit runtime install`
@@ -173,5 +179,4 @@ npm run test:system
 `test:system` runs real end-to-end fixtures from `test/fixtures/system/`. It requires:
 
 - Docker with a running daemon
-- `k6` on `PATH`
 - Playwright Chromium browser assets available to `@playwright/test`

package/lib/config/index.mjs

@@ -23,6 +23,7 @@ import {
 
 const RUNNER_MANIFEST = "runner.manifest.json";
 const TESTKIT_CONFIG = "testkit.config.json";
+const TESTKIT_K6_BIN = "TESTKIT_K6_BIN";
 export function parseDotenv(filePath) {
   if (!fs.existsSync(filePath)) return {};
   return parseDotenvString(fs.readFileSync(filePath, "utf8"));
@@ -94,15 +95,35 @@ export function loadConfigs(opts = {}) {
   });
 }
 
-export function resolveDalBinary() {
+export function resolveK6Binary() {
+  const override = process.env[TESTKIT_K6_BIN]?.trim();
+  if (override) {
+    const isPathLike =
+      path.isAbsolute(override) ||
+      override.includes(path.sep) ||
+      override.includes(path.posix.sep) ||
+      override.includes(path.win32.sep);
+    const overridePath = isPathLike ? path.resolve(process.cwd(), override) : override;
+
+    if (isPathLike && !fs.existsSync(overridePath)) {
+      throw new Error(`${TESTKIT_K6_BIN} points to a missing file: ${overridePath}`);
+    }
+
+    return overridePath;
+  }
+
   const thisFile = fileURLToPath(import.meta.url);
   const abs = path.resolve(path.dirname(thisFile), "..", "..", "vendor", "k6");
   if (!fs.existsSync(abs)) {
-    throw new Error(`Bundled DAL k6 binary not found: ${abs}`);
+    throw new Error(`Bundled k6 binary not found: ${abs}`);
   }
   return abs;
 }
 
+export function resolveDalBinary() {
+  return resolveK6Binary();
+}
+
 export function resolveServiceCwd(productDir, maybeRelative) {
   return path.resolve(productDir, maybeRelative || ".");
 }

package/lib/config/index.test.mjs

@@ -1,12 +1,44 @@
 import fs from "fs";
 import path from "path";
-import { describe, expect, it } from "vitest";
-import { resolveDalBinary } from "./index.mjs";
+import os from "os";
+import { afterEach, describe, expect, it } from "vitest";
+import { resolveDalBinary, resolveK6Binary } from "./index.mjs";
+
+const originalK6Bin = process.env.TESTKIT_K6_BIN;
+
+afterEach(() => {
+  if (originalK6Bin === undefined) {
+    delete process.env.TESTKIT_K6_BIN;
+  } else {
+    process.env.TESTKIT_K6_BIN = originalK6Bin;
+  }
+});
 
 describe("config-index", () => {
-  it("resolves the bundled DAL k6 binary from the package root", () => {
-    const binaryPath = resolveDalBinary();
+  it("resolves the bundled k6 binary from the package root", () => {
+    const binaryPath = resolveK6Binary();
     expect(path.basename(binaryPath)).toBe("k6");
     expect(fs.existsSync(binaryPath)).toBe(true);
   });
+
+  it("keeps resolveDalBinary aligned with the shared k6 resolver", () => {
+    expect(resolveDalBinary()).toBe(resolveK6Binary());
+  });
+
+  it("uses TESTKIT_K6_BIN when provided with a relative path", () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-k6-"));
+    const binPath = path.join(tempDir, "k6-custom");
+    fs.writeFileSync(binPath, "#!/usr/bin/env bash\nexit 0\n");
+    process.env.TESTKIT_K6_BIN = path.relative(process.cwd(), binPath);
+
+    expect(resolveK6Binary()).toBe(binPath);
+  });
+
+  it("throws a clear error when TESTKIT_K6_BIN points at a missing path", () => {
+    process.env.TESTKIT_K6_BIN = "./definitely-missing-k6-bin";
+
+    expect(() => resolveK6Binary()).toThrow(
+      /TESTKIT_K6_BIN points to a missing file/
+    );
+  });
 });

package/lib/runner/index.mjs

@@ -4,7 +4,7 @@ import { spawn } from "child_process";
 import net from "net";
 import { execa, execaCommand } from "execa";
 import { bundleK6File } from "../bundler/index.mjs";
-import { resolveDalBinary, resolveServiceCwd } from "../config/index.mjs";
+import { resolveK6Binary, resolveServiceCwd } from "../config/index.mjs";
 import {
   cleanupOrphanedLocalInfrastructure,
   destroyRuntimeDatabase,
@@ -521,6 +521,7 @@ async function runHttpK6Batch(targetConfig, batch) {
 
 async function runHttpK6Task(targetConfig, task, baseUrl) {
   const absFile = path.join(targetConfig.productDir, task.file);
+  const k6Binary = resolveK6Binary();
   const bundledFile = await bundleK6File({
     productDir: targetConfig.productDir,
     serviceName: targetConfig.name,
@@ -529,7 +530,7 @@ async function runHttpK6Task(targetConfig, task, baseUrl) {
   console.log(`·· ${targetConfig.workerLabel}:${task.suiteName} → ${task.file}`);
   const startedAt = Date.now();
   try {
-    await execa("k6", ["run", "--address", "127.0.0.1:0", "-e", `BASE_URL=${baseUrl}`, bundledFile], {
+    await execa(k6Binary, ["run", "--address", "127.0.0.1:0", "-e", `BASE_URL=${baseUrl}`, bundledFile], {
       cwd: targetConfig.productDir,
       env: buildExecutionEnv(targetConfig),
       stdio: "inherit",
@@ -567,7 +568,7 @@ async function runDalBatch(targetConfig, batch) {
 
 async function runDalTask(targetConfig, task, databaseUrl) {
   const absFile = path.join(targetConfig.productDir, task.file);
-  const k6Binary = resolveDalBinary();
+  const k6Binary = resolveK6Binary();
   const bundledFile = await bundleK6File({
     productDir: targetConfig.productDir,
     serviceName: targetConfig.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "CLI for running manifest-defined local test suites across k6 and Playwright",
   "type": "module",
   "exports": {