@elench/testkit 0.1.32 → 0.1.34

package/lib/runner/results.mjs

@@ -32,13 +32,6 @@ export function buildServiceTrackers(servicePlans, startedAt) {
       completedFileCount: 0,
       failedFiles: [],
       failedFileSet: new Set(),
-      fileResults: suite.files.map((file) => ({
-        path: normalizePathSeparators(file),
-        failed: false,
-        durationMs: 0,
-        error: null,
-        status: "not_run",
-      })),
       fileResultsByPath: new Map(
         suite.files.map((file) => {
           const normalizedPath = normalizePathSeparators(file);
@@ -57,9 +50,6 @@ export function buildServiceTrackers(servicePlans, startedAt) {
       durationMs: 0,
       error: null,
     }));
-    for (const suite of suites) {
-      suite.fileResults = [...suite.fileResultsByPath.values()];
-    }
 
     trackers.set(plan.config.name, {
       name: plan.config.name,
@@ -112,15 +102,13 @@ export function recordTaskOutcome(trackers, task, outcome, finishedAt = Date.now
     existingFileResult.error = outcome.error;
     existingFileResult.status = outcome.failed ? "failed" : "passed";
   } else {
-    const fileResult = {
+    suite.fileResultsByPath.set(normalizedPath, {
       path: normalizedPath,
       failed: outcome.failed,
       durationMs: outcomeDurationMs,
       error: outcome.error,
       status: outcome.failed ? "failed" : "passed",
-    };
-    suite.fileResultsByPath.set(normalizedPath, fileResult);
-    suite.fileResults.push(fileResult);
+    });
   }
   if (outcome.failed && !suite.failedFileSet.has(task.file)) {
     suite.failedFileSet.add(task.file);
@@ -164,25 +152,18 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
     };
   }
 
-  const suites = [...tracker.suites].sort(
-    (a, b) => a.orderIndex - b.orderIndex || a.name.localeCompare(b.name)
-  );
+  const suites = [...tracker.suites]
+    .sort((a, b) => a.orderIndex - b.orderIndex || a.name.localeCompare(b.name))
+    .map((suite) => finalizeSuite(suite));
+
   const completedSuiteCount = suites.filter(
     (suite) => suite.completedFileCount === suite.fileCount
   ).length;
-  const failedSuiteCount = suites.filter((suite) => suite.failedFiles.length > 0).length;
+  const failedSuiteCount = suites.filter((suite) => suite.failedFileCount > 0).length;
   const totalFileCount = suites.reduce((sum, suite) => sum + suite.fileCount, 0);
-  const completedFileCount = suites.reduce(
-    (sum, suite) => sum + suite.completedFileCount,
-    0
-  );
-  const failedFileCount = suites.reduce((sum, suite) => sum + suite.failedFiles.length, 0);
-  const passedFileCount = suites.reduce(
-    (sum, suite) =>
-      sum +
-      suite.fileResults.filter((file) => file.status === "passed").length,
-    0
-  );
+  const completedFileCount = suites.reduce((sum, suite) => sum + suite.completedFileCount, 0);
+  const failedFileCount = suites.reduce((sum, suite) => sum + suite.failedFileCount, 0);
+  const passedFileCount = suites.reduce((sum, suite) => sum + suite.passedFileCount, 0);
   const notRunFileCount = totalFileCount - completedFileCount;
   const totalTaskDurationMs =
     tracker.totalTaskDurationMs || suites.reduce((sum, suite) => sum + suite.durationMs, 0);
@@ -209,207 +190,11 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
     notRunFileCount,
     durationMs,
     totalTaskDurationMs,
-    suites: suites.map((suite) => ({
-      name: suite.name,
-      type: suite.type,
-      framework: formatFrameworkForArtifact(suite.framework),
-      failed: suite.failedFiles.length > 0,
-      fileCount: suite.fileCount,
-      completedFileCount: suite.completedFileCount,
-      passedFileCount: suite.fileResults.filter((file) => file.status === "passed").length,
-      failedFileCount: suite.failedFiles.length,
-      notRunFileCount: suite.fileCount - suite.completedFileCount,
-      failedFiles: suite.failedFiles,
-      durationMs: suite.durationMs,
-      error: suite.error,
-      files: suite.fileResults
-        .slice()
-        .sort((a, b) => a.path.localeCompare(b.path))
-        .map((file) => ({
-          path: file.path,
-          failed: file.failed,
-          status: file.status,
-          durationMs: file.durationMs,
-          error: file.error,
-        })),
-    })),
+    suites,
     errors: tracker.errors,
   };
 }
 
-export function buildStatusArtifact({
-  productDir,
-  results,
-  suiteType,
-  suiteNames,
-  fileNames,
-  framework,
-  shard,
-  serviceFilter,
-  metadata,
-}) {
-  const executedResults = results.filter((result) => !result.skipped);
-  const tests = [];
-
-  for (const result of executedResults) {
-    for (const suite of result.suites) {
-      for (const file of suite.files) {
-        tests.push({
-          service: result.name,
-          type: suite.type,
-          path: file.path,
-          status: file.status,
-        });
-      }
-    }
-  }
-
-  tests.sort(
-    (left, right) =>
-      left.service.localeCompare(right.service) ||
-      left.type.localeCompare(right.type) ||
-      left.path.localeCompare(right.path)
-  );
-
-  const summary = {
-    services: {
-      total: executedResults.length,
-      passed: executedResults.filter((result) => !result.failed).length,
-      failed: executedResults.filter((result) => result.failed).length,
-    },
-    tests: {
-      total: tests.length,
-      passed: tests.filter((test) => test.status === "passed").length,
-      failed: tests.filter((test) => test.status === "failed").length,
-      notRun: tests.filter((test) => test.status === "not_run").length,
-    },
-  };
-
-  const scope = {
-    suiteType,
-    suiteNames: [...(suiteNames || [])].sort(),
-    fileNames: [...(fileNames || [])].sort(),
-    framework: formatFrameworkForArtifact(framework || "all"),
-    shard: shard || null,
-    serviceFilter: serviceFilter || null,
-  };
-  scope.isFullRun =
-    scope.suiteNames.length === 0 &&
-    scope.fileNames.length === 0 &&
-    scope.framework === "all" &&
-    scope.shard === null &&
-    scope.serviceFilter === null;
-
-  return {
-    schemaVersion: 1,
-    source: "testkit",
-    notice: "Generated file. Do not edit manually.",
-    product: {
-      name: path.basename(productDir),
-    },
-    git: {
-      branch: metadata.git?.branch || null,
-      commitSha: metadata.git?.commitSha || null,
-    },
-    testkitVersion: metadata.testkitVersion,
-    scope,
-    summary,
-    tests,
-  };
-}
-
-export function buildRunArtifact({
-  productDir,
-  results,
-  startedAt,
-  finishedAt,
-  requestedJobs,
-  workerCount,
-  suiteType,
-  suiteNames,
-  fileNames,
-  framework,
-  shard,
-  serviceFilter,
-  metadata,
-}) {
-  const executed = results.filter((result) => !result.skipped);
-  const failedServices = executed.filter((result) => result.failed);
-  const totalSuites = executed.reduce((sum, result) => sum + result.suiteCount, 0);
-  const completedSuites = executed.reduce((sum, result) => sum + result.completedSuiteCount, 0);
-  const failedSuites = executed.reduce((sum, result) => sum + result.failedSuiteCount, 0);
-  const totalFiles = executed.reduce((sum, result) => sum + (result.totalFileCount || 0), 0);
-  const passedFiles = executed.reduce((sum, result) => sum + (result.passedFileCount || 0), 0);
-  const failedFiles = executed.reduce((sum, result) => sum + (result.failedFileCount || 0), 0);
-  const notRunFiles = executed.reduce((sum, result) => sum + (result.notRunFileCount || 0), 0);
-  const dbBackend = summarizeDbBackend(results);
-
-  return {
-    schemaVersion: 1,
-    source: "testkit",
-    generatedAt: new Date(finishedAt).toISOString(),
-    product: {
-      name: path.basename(productDir),
-      directory: productDir,
-    },
-    git: metadata.git,
-    host: metadata.host,
-    run: {
-      status: failedServices.length > 0 ? "failed" : "passed",
-      startedAt: new Date(startedAt).toISOString(),
-      finishedAt: new Date(finishedAt).toISOString(),
-      durationMs: finishedAt - startedAt,
-      requestedJobs,
-      workerCount,
-      dbBackend,
-      suiteType,
-      suiteNames,
-      fileNames,
-      framework: formatFrameworkForArtifact(framework),
-      shard,
-      serviceFilter,
-      testkitVersion: metadata.testkitVersion,
-    },
-    summary: {
-      services: {
-        total: executed.length,
-        passed: executed.length - failedServices.length,
-        failed: failedServices.length,
-      },
-      suites: {
-        total: totalSuites,
-        completed: completedSuites,
-        passed: completedSuites - failedSuites,
-        failed: failedSuites,
-      },
-      files: {
-        total: totalFiles,
-        passed: passedFiles,
-        failed: failedFiles,
-        notRun: notRunFiles,
-      },
-    },
-    services: results.map((result) => ({
-      name: result.name,
-      failed: result.failed,
-      skipped: result.skipped,
-      suiteCount: result.suiteCount,
-      completedSuiteCount: result.completedSuiteCount,
-      failedSuiteCount: result.failedSuiteCount,
-      totalFileCount: result.totalFileCount,
-      completedFileCount: result.completedFileCount,
-      passedFileCount: result.passedFileCount,
-      failedFileCount: result.failedFileCount,
-      notRunFileCount: result.notRunFileCount,
-      durationMs: result.durationMs,
-      totalTaskDurationMs: result.totalTaskDurationMs,
-      dbBackend: result.dbBackend,
-      suites: result.suites,
-      errors: result.errors,
-    })),
-  };
-}
-
 export function summarizeDbBackend(results) {
   const values = [...new Set(results.map((result) => result.dbBackend).filter(Boolean))];
   if (values.length === 0) return null;
@@ -417,36 +202,32 @@ export function summarizeDbBackend(results) {
   return "mixed";
 }
 
-export function formatDuration(durationMs) {
-  const totalSeconds = Math.max(0, Math.round(durationMs / 1000));
-  const minutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  if (minutes === 0) return `${seconds}s`;
-  return `${minutes}m ${String(seconds).padStart(2, "0")}s`;
-}
-
-export function formatServiceSummary(result) {
-  const passedSuites = result.completedSuiteCount - result.failedSuiteCount;
-  const notRunSuites = result.suiteCount - result.completedSuiteCount;
-  let detail = `${passedSuites}/${result.suiteCount} suites passed`;
-  if ((result.totalFileCount || 0) > 0) {
-    detail += `, ${result.passedFileCount}/${result.totalFileCount} files passed`;
-  }
-  if (notRunSuites > 0) {
-    detail += `, ${notRunSuites} ${pluralize(notRunSuites, "suite", "suites")} not run`;
-  } else if ((result.notRunFileCount || 0) > 0) {
-    detail += `, ${result.notRunFileCount} ${pluralize(result.notRunFileCount, "file", "files")} not run`;
-  }
-  return detail;
-}
-
-export function formatError(error) {
-  if (error instanceof Error) return sanitizeErrorMessage(error.message);
-  return sanitizeErrorMessage(String(error));
-}
+function finalizeSuite(suite) {
+  const files = [...suite.fileResultsByPath.values()]
+    .sort((a, b) => a.path.localeCompare(b.path))
+    .map((file) => ({
+      path: file.path,
+      failed: file.failed,
+      status: file.status,
+      durationMs: file.durationMs,
+      error: file.error,
+    }));
 
-export function longestServiceName(results) {
-  return results.reduce((max, result) => Math.max(max, result.name.length), 4);
+  return {
+    name: suite.name,
+    type: suite.type,
+    framework: formatFrameworkForArtifact(suite.framework),
+    failed: suite.failedFiles.length > 0,
+    fileCount: suite.fileCount,
+    completedFileCount: suite.completedFileCount,
+    passedFileCount: files.filter((file) => file.status === "passed").length,
+    failedFileCount: suite.failedFiles.length,
+    notRunFileCount: suite.fileCount - suite.completedFileCount,
+    failedFiles: suite.failedFiles,
+    durationMs: suite.durationMs,
+    error: suite.error,
+    files,
+  };
 }
 
 function normalizePathSeparators(filePath) {
@@ -457,14 +238,3 @@ function formatFrameworkForArtifact(framework) {
   if (framework === "k6") return "default";
   return framework;
 }
-
-function sanitizeErrorMessage(message) {
-  return message
-    .replace(/Command failed with exit code (\d+): .*?[\\/]vendor[\\/]k6 run\b/g, "Default runtime failed with exit code $1:")
-    .replace(/Command failed with exit code (\d+): k6 run\b/g, "Default runtime failed with exit code $1:")
-    .replace(/[\\/]vendor[\\/]k6\b/g, "default-runtime");
-}
-
-function pluralize(value, singular, plural) {
-  return value === 1 ? singular : plural;
-}

package/lib/runner/results.test.mjs

@@ -1,19 +1,14 @@
 import { describe, expect, it } from "vitest";
 import {
   addTrackerError,
-  buildRunArtifact,
-  buildStatusArtifact,
   buildServiceTrackers,
   finalizeServiceResult,
-  formatDuration,
-  formatError,
-  formatServiceSummary,
   recordGraphError,
   recordTaskOutcome,
   summarizeDbBackend,
 } from "./results.mjs";
 
-describe("runner-results", () => {
+describe("runner results", () => {
   it("tracks task outcomes and graph errors", () => {
     const trackers = buildServiceTrackers(
       [
@@ -198,204 +193,9 @@ describe("runner-results", () => {
     expect(result.totalTaskDurationMs).toBe(3_000);
   });
 
-  it("builds run artifacts and formatting helpers", () => {
-    const results = [
-      {
-        name: "api",
-        failed: false,
-        skipped: false,
-        suiteCount: 1,
-        completedSuiteCount: 1,
-        failedSuiteCount: 0,
-        totalFileCount: 3,
-        completedFileCount: 3,
-        passedFileCount: 3,
-        failedFileCount: 0,
-        notRunFileCount: 0,
-        durationMs: 1200,
-        totalTaskDurationMs: 2400,
-        dbBackend: "local",
-        suites: [],
-        errors: [],
-      },
-      {
-        name: "frontend",
-        failed: false,
-        skipped: true,
-        suiteCount: 0,
-        completedSuiteCount: 0,
-        failedSuiteCount: 0,
-        totalFileCount: 0,
-        completedFileCount: 0,
-        passedFileCount: 0,
-        failedFileCount: 0,
-        notRunFileCount: 0,
-        durationMs: 0,
-        totalTaskDurationMs: 0,
-        dbBackend: null,
-        suites: [],
-        errors: [],
-      },
-    ];
-
-    const artifact = buildRunArtifact({
-      productDir: "/tmp/my-product",
-      results,
-      startedAt: 1000,
-      finishedAt: 4000,
-      requestedJobs: 2,
-      workerCount: 1,
-      suiteType: "all",
-      suiteNames: [],
-      fileNames: [],
-      framework: "all",
-      shard: null,
-      serviceFilter: null,
-      metadata: {
-        git: {
-          branch: "main",
-          commitSha: "abc",
-          repoRoot: "/tmp",
-        },
-        host: {
-          hostname: "local",
-          username: "dev",
-        },
-        testkitVersion: "0.1.17",
-      },
-    });
-
-    expect(artifact.product.name).toBe("my-product");
-    expect(artifact.summary.services.total).toBe(1);
-    expect(artifact.summary.files).toEqual({
-      total: 3,
-      passed: 3,
-      failed: 0,
-      notRun: 0,
-    });
-    expect(artifact.services[0].durationMs).toBe(1200);
-    expect(artifact.services[0].totalTaskDurationMs).toBe(2400);
-    expect(summarizeDbBackend(results)).toBe("local");
-    expect(formatDuration(65_000)).toBe("1m 05s");
+  it("summarizes mixed db backends", () => {
     expect(
-      formatServiceSummary({
-        completedSuiteCount: 2,
-        failedSuiteCount: 1,
-        suiteCount: 3,
-        totalFileCount: 6,
-        passedFileCount: 5,
-        notRunFileCount: 1,
-      })
-    ).toBe("1/3 suites passed, 5/6 files passed, 1 suite not run");
-    expect(formatError(new Error("boom"))).toBe("boom");
-  });
-
-  it("builds deterministic status artifacts", () => {
-    const status = buildStatusArtifact({
-      productDir: "/tmp/my-product",
-      results: [
-        {
-          name: "api",
-          failed: true,
-          skipped: false,
-          suites: [
-            {
-              name: "health",
-              type: "integration",
-              framework: "k6",
-              files: [
-                { path: "tests/api/integration/a.int.testkit.ts", status: "passed" },
-                { path: "tests/api/integration/b.int.testkit.ts", status: "failed" },
-              ],
-            },
-          ],
-        },
-      ],
-      suiteType: "int",
-      suiteNames: ["health"],
-      fileNames: ["tests/api/integration/b.int.testkit.ts"],
-      framework: "default",
-      shard: null,
-      serviceFilter: "api",
-      metadata: {
-        git: {
-          branch: "main",
-          commitSha: "abc123",
-        },
-        testkitVersion: "0.1.20",
-      },
-    });
-
-    expect(status).toEqual({
-      schemaVersion: 1,
-      source: "testkit",
-      notice: "Generated file. Do not edit manually.",
-      product: {
-        name: "my-product",
-      },
-      git: {
-        branch: "main",
-        commitSha: "abc123",
-      },
-      testkitVersion: "0.1.20",
-      scope: {
-        suiteType: "int",
-        suiteNames: ["health"],
-        fileNames: ["tests/api/integration/b.int.testkit.ts"],
-        framework: "default",
-        shard: null,
-        serviceFilter: "api",
-        isFullRun: false,
-      },
-      summary: {
-        services: {
-          total: 1,
-          passed: 0,
-          failed: 1,
-        },
-        tests: {
-          total: 2,
-          passed: 1,
-          failed: 1,
-          notRun: 0,
-        },
-      },
-      tests: [
-        {
-          service: "api",
-          type: "integration",
-          path: "tests/api/integration/a.int.testkit.ts",
-          status: "passed",
-        },
-        {
-          service: "api",
-          type: "integration",
-          path: "tests/api/integration/b.int.testkit.ts",
-          status: "failed",
-        },
-      ],
-    });
-  });
-
-  it("marks unfiltered status artifacts as full runs", () => {
-    const status = buildStatusArtifact({
-      productDir: "/tmp/my-product",
-      results: [],
-      suiteType: "all",
-      suiteNames: [],
-      fileNames: [],
-      framework: "all",
-      shard: null,
-      serviceFilter: null,
-      metadata: {
-        git: {
-          branch: "main",
-          commitSha: "abc123",
-        },
-        testkitVersion: "0.1.20",
-      },
-    });
-
-    expect(status.scope.isFullRun).toBe(true);
+      summarizeDbBackend([{ dbBackend: "local" }, { dbBackend: "neon" }])
+    ).toBe("mixed");
   });
 });