@elench/testkit 0.1.4 → 0.1.6

package/README.md

@@ -51,7 +51,8 @@ npx @elench/testkit destroy
 2. **Neon** — discovers or creates a `<service>-test` branch, truncates tables between runs
 3. **Fly** — discovers or creates a machine on the service's test app, updates env vars
 4. **k6** — runs matched test files with `BASE_URL` and `MACHINE_ID` injected
-5. **Cleanup** — stops the Fly machine (preserved for next run)
+5. **DAL** — DAL tests use a bundled k6-sql binary (`vendor/k6`) — no external binary needed
+6. **Cleanup** — stops the Fly machine (preserved for next run)
 
 Multi-service products run all services in parallel. Each service gets its own Neon branch and Fly machine.
 

package/infra/fly-build.sh

@@ -6,7 +6,8 @@ set -eo pipefail
 export PATH="$PATH:/snap/bin:$HOME/.fly/bin"
 
 STATE_DIR="${STATE_DIR:-.state}"
-API_DIR="$(cd "${API_DIR:?API_DIR required — set to the service directory containing the Dockerfile}" && pwd)"
+API_DIR="$(cd "${API_DIR:?API_DIR required — set to the product directory}" && pwd)"
+DOCKERFILE_DIR="$(cd "${DOCKERFILE_DIR:-$API_DIR}" && pwd)"
 FLY_APP="${FLY_APP:?FLY_APP required}"
 
 SHORT_SHA=$(git -C "$API_DIR" rev-parse --short HEAD)
@@ -44,7 +45,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 bash "$SCRIPT_DIR/fly-app-ensure.sh"
 
 echo "Building image: $IMAGE"
-docker build -t "$IMAGE" -f "$API_DIR/Dockerfile" "$API_DIR"
+docker build -t "$IMAGE" -f "$DOCKERFILE_DIR/Dockerfile" "$API_DIR"
 
 echo "Pushing to Fly registry..."
 fly auth docker

package/lib/config.mjs

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { fileURLToPath } from "url";
 
 /**
  * Parse a .env file into an object. Supports KEY=VALUE, KEY='VALUE', KEY="VALUE".
@@ -113,17 +114,13 @@ export function requireFlyToken(serviceName) {
 }
 
 /**
- * Resolve the custom k6 binary for DAL tests. Returns the absolute path.
+ * Resolve the bundled k6-sql binary for DAL tests. Returns the absolute path.
  */
-export function resolveDalBinary(config) {
-  const { productDir, manifest } = config;
-  const rel = manifest.testkit.dal?.k6Binary;
-  if (!rel) {
-    throw new Error("testkit.dal.k6Binary is required for DAL tests");
-  }
-  const abs = path.resolve(productDir, rel);
+export function resolveDalBinary() {
+  const thisFile = fileURLToPath(import.meta.url);
+  const abs = path.resolve(path.dirname(thisFile), "..", "vendor", "k6");
   if (!fs.existsSync(abs)) {
-    throw new Error(`DAL k6 binary not found: ${abs}`);
+    throw new Error(`Bundled DAL k6 binary not found: ${abs}`);
   }
   return abs;
 }
@@ -185,16 +182,8 @@ function validateService(name, svc, manifestPath) {
       errors.push(`${ctx}: testkit.k6 must be an object`);
     }
 
-    if (tk.dal !== undefined) {
-      if (!isObject(tk.dal)) {
-        errors.push(`${ctx}: testkit.dal must be an object`);
-      } else if (svc.suites?.dal) {
-        requireString(errors, tk.dal, `${ctx}: testkit.dal.k6Binary`, "k6Binary");
-      }
-    }
-
-    if (svc.suites?.dal && !tk.dal) {
-      errors.push(`${ctx}: testkit.dal is required when suites.dal exists`);
+    if (tk.dal !== undefined && !isObject(tk.dal)) {
+      errors.push(`${ctx}: testkit.dal must be an object`);
     }
   }
 

package/lib/runner.mjs

@@ -49,6 +49,7 @@ export async function build(config) {
     FLY_APP: tk.fly.app,
     FLY_ORG: tk.fly.org,
     API_DIR: productDir,
+    DOCKERFILE_DIR: tk.dockerfile ? path.join(productDir, tk.dockerfile) : productDir,
     STATE_DIR: stateDir,
   });
 }
@@ -156,7 +157,7 @@ export async function runTests(config, files) {
 export async function runDalTests(config, files) {
   const { productDir, stateDir, manifest } = config;
   const tk = manifest.testkit;
-  const k6Binary = resolveDalBinary(config);
+  const k6Binary = resolveDalBinary();
 
   // Read DATABASE_URL from neon state
   const databaseUrl = fs.readFileSync(path.join(stateDir, "database_url"), "utf8").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "CLI for running k6 tests against real, ephemeral infrastructure",
   "type": "module",
   "bin": {
@@ -9,7 +9,8 @@
   "files": [
     "bin/",
     "lib/",
-    "infra/"
+    "infra/",
+    "vendor/"
   ],
   "dependencies": {
     "cac": "^6.7.14",