@elench/testkit 0.1.12 → 0.1.13

package/README.md

@@ -48,6 +48,7 @@ npx @elench/testkit destroy
 
 1. **Discovery** — reads `runner.manifest.json` for services, suites, files, and frameworks
 2. **Config** — reads `testkit.config.json` for local runtime, migration, dependency, and database settings
+   Per-service `.env` files declared in config are loaded when present.
 3. **Database** — provisions a Neon branch when a service declares one
 4. **Seed** — runs optional product seed commands against the provisioned database
 5. **Runtime** — starts required local services, waits for readiness, and injects test env
@@ -59,6 +60,11 @@ npx @elench/testkit destroy
 - `runner.manifest.json`: canonical test inventory
 - `testkit.config.json`: local execution and provisioning config
 
+`testkit.config.json` can also declare:
+
+- `envFile` / `envFiles` for service-specific environment loading
+- `databaseFrom` for dependency services that must share another service's `DATABASE_URL`
+
 ## Parallel execution
 
 `@elench/testkit` can run suites in parallel with `--jobs <n>`.

package/lib/config.mjs

@@ -68,13 +68,17 @@ export function loadConfigs(opts = {}) {
     }
 
     validateMergedService(name, runnerService, serviceConfig, productDir);
+    const serviceEnv = loadServiceEnv(productDir, serviceConfig);
 
     return {
       name,
       productDir,
       stateDir: path.join(productDir, ".testkit", name),
       suites: runnerService.suites,
-      testkit: serviceConfig,
+      testkit: {
+        ...serviceConfig,
+        serviceEnv,
+      },
     };
   });
 }
@@ -228,6 +232,20 @@ function validateConfigCoverage(runner, config) {
         );
       }
     }
+
+    const databaseFrom = config.services[serviceName].databaseFrom;
+    if (databaseFrom) {
+      if (!config.services[databaseFrom]) {
+        throw new Error(
+          `Service "${serviceName}" databaseFrom "${databaseFrom}" is missing from ${TESTKIT_CONFIG}`
+        );
+      }
+      if (!runner.services[databaseFrom]) {
+        throw new Error(
+          `Service "${serviceName}" databaseFrom "${databaseFrom}" is missing from ${RUNNER_MANIFEST}`
+        );
+      }
+    }
   }
 }
 
@@ -263,7 +281,11 @@ export function isSiblingProduct(name) {
 
 function validateMergedService(name, runnerService, serviceConfig, productDir) {
   const usesLocalExecution = Object.values(runnerService.suites).some((suites) =>
-    suites.some((suite) => suite.framework !== "k6" || !isDalSuiteType(suite, runnerService, suites))
+    suites.some(
+      (suite) =>
+        (suite.framework && suite.framework !== "k6") ||
+        !isDalSuiteType(suite, runnerService, suites)
+    )
   );
 
   if (usesLocalExecution && !isObject(serviceConfig.local)) {
@@ -306,6 +328,7 @@ function validateMergedService(name, runnerService, serviceConfig, productDir) {
       );
     }
   }
+
 }
 
 function validateServiceConfig(name, service, configPath) {
@@ -319,6 +342,27 @@ function validateServiceConfig(name, service, configPath) {
     }
   }
 
+  if (service.databaseFrom !== undefined && typeof service.databaseFrom !== "string") {
+    throw new Error(`Service "${name}" databaseFrom must be a string`);
+  }
+
+  if (service.database !== undefined && service.databaseFrom !== undefined) {
+    throw new Error(
+      `Service "${name}" cannot define both database and databaseFrom`
+    );
+  }
+
+  if (service.envFile !== undefined && typeof service.envFile !== "string") {
+    throw new Error(`Service "${name}" envFile must be a string`);
+  }
+
+  if (
+    service.envFiles !== undefined &&
+    (!Array.isArray(service.envFiles) || service.envFiles.some((v) => typeof v !== "string"))
+  ) {
+    throw new Error(`Service "${name}" envFiles must be an array of strings`);
+  }
+
   if (service.database !== undefined) {
     if (!isObject(service.database)) {
       throw new Error(`Service "${name}" database must be an object`);
@@ -385,6 +429,23 @@ function validateServiceConfig(name, service, configPath) {
   }
 }
 
+function loadServiceEnv(productDir, serviceConfig) {
+  const env = {};
+  for (const envFile of getServiceEnvFiles(serviceConfig)) {
+    Object.assign(env, parseDotenv(resolveServiceCwd(productDir, envFile)));
+  }
+  return env;
+}
+
+function getServiceEnvFiles(serviceConfig) {
+  const files = [];
+  if (serviceConfig.envFile) files.push(serviceConfig.envFile);
+  if (Array.isArray(serviceConfig.envFiles)) {
+    files.push(...serviceConfig.envFiles);
+  }
+  return files;
+}
+
 function requireString(obj, key, label) {
   if (typeof obj[key] !== "string" || obj[key].length === 0) {
     throw new Error(`${label} must be a non-empty string`);

package/lib/runner.mjs

@@ -340,7 +340,7 @@ function resolveWorkerConfig(
   readyUrlByService,
   urlMappings
 ) {
-  const stateDir = getWorkerServiceStateDir(workerStateDir, targetConfig.name, config.name);
+  const stateDir = resolveServiceStateDir(workerStateDir, targetConfig.name, config);
   const context = {
     workerId,
     serviceName: config.name,
@@ -476,7 +476,7 @@ async function runMigrations(runtimeConfigs) {
     const migrate = config.testkit.migrate;
     if (!migrate) continue;
 
-    const env = { ...process.env };
+    const env = buildExecutionEnv(config);
     const dbUrl = readDatabaseUrl(config.stateDir);
     if (dbUrl) env.DATABASE_URL = dbUrl;
 
@@ -495,7 +495,7 @@ async function runSeeds(runtimeConfigs) {
     const seed = config.testkit.seed;
     if (!seed) continue;
 
-    const env = { ...process.env };
+    const env = buildExecutionEnv(config);
     const dbUrl = readDatabaseUrl(config.stateDir);
     if (dbUrl) env.DATABASE_URL = dbUrl;
 
@@ -528,10 +528,7 @@ async function startLocalServices(runtimeConfigs) {
 
 async function startLocalService(config) {
   const cwd = resolveServiceCwd(config.productDir, config.testkit.local.cwd);
-  const env = {
-    ...process.env,
-    ...config.testkit.local.env,
-  };
+  const env = buildExecutionEnv(config, config.testkit.local.env);
   const port = config.testkit.local.port || numericPortFromUrl(config.testkit.local.baseUrl);
   if (port) {
     env.PORT = String(port);
@@ -603,7 +600,7 @@ async function runHttpK6Suite(targetConfig, suite) {
     try {
       await execa("k6", ["run", "-e", `BASE_URL=${baseUrl}`, absFile], {
         cwd: targetConfig.productDir,
-        env: process.env,
+        env: buildExecutionEnv(targetConfig),
         stdio: "inherit",
       });
     } catch {
@@ -628,7 +625,7 @@ async function runDalSuite(targetConfig, suite) {
     try {
       await execa(k6Binary, ["run", "-e", `DATABASE_URL=${databaseUrl}`, absFile], {
         cwd: targetConfig.productDir,
-        env: process.env,
+        env: buildExecutionEnv(targetConfig),
         stdio: "inherit",
       });
     } catch {
@@ -655,13 +652,7 @@ async function runPlaywrightSuite(targetConfig, suite) {
   try {
     await execa("npx", ["playwright", "test", ...files], {
       cwd,
-      env: {
-        ...process.env,
-        BASE_URL: local.baseUrl,
-        PLAYWRIGHT_HTML_OPEN: "never",
-        TESTKIT_MANAGED_SERVERS: "1",
-        TESTKIT_WORKER_ID: String(targetConfig.workerId),
-      },
+      env: buildPlaywrightEnv(targetConfig, local.baseUrl),
       stdio: "inherit",
     });
     return { failed: false };
@@ -716,6 +707,11 @@ function needsLocalRuntime(suites) {
   return suites.some((suite) => suite.type !== "dal");
 }
 
+function resolveServiceStateDir(workerStateDir, targetName, config) {
+  const dbSource = config.testkit.databaseFrom || config.name;
+  return getWorkerServiceStateDir(workerStateDir, targetName, dbSource);
+}
+
 function getWorkerServiceStateDir(workerStateDir, targetName, serviceName) {
   if (targetName === serviceName) {
     return workerStateDir;
@@ -723,6 +719,44 @@ function getWorkerServiceStateDir(workerStateDir, targetName, serviceName) {
   return path.join(workerStateDir, "deps", serviceName);
 }
 
+function buildExecutionEnv(config, extraEnv = {}) {
+  return {
+    ...process.env,
+    ...(config.testkit.serviceEnv || {}),
+    ...extraEnv,
+  };
+}
+
+function buildPlaywrightEnv(config, baseUrl) {
+  const env = buildExecutionEnv(config, {
+    BASE_URL: baseUrl,
+    PLAYWRIGHT_HTML_OPEN: "never",
+    PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS:
+      process.env.PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS || "1",
+    TESTKIT_MANAGED_SERVERS: "1",
+    TESTKIT_WORKER_ID: String(config.workerId),
+  });
+
+  const browsersPath = resolvePlaywrightBrowsersPath(env.PLAYWRIGHT_BROWSERS_PATH);
+  if (browsersPath) {
+    env.PLAYWRIGHT_BROWSERS_PATH = browsersPath;
+  }
+
+  return env;
+}
+
+function resolvePlaywrightBrowsersPath(configuredPath) {
+  const home = process.env.HOME;
+  if (home) {
+    const fallback = path.join(home, ".cache", "ms-playwright");
+    if (fs.existsSync(fallback)) {
+      return fallback;
+    }
+  }
+
+  return configuredPath;
+}
+
 function readDatabaseUrl(stateDir) {
   return readStateValue(path.join(stateDir, "database_url"));
 }

package/package.json

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