@elench/testkit 0.1.30 → 0.1.31

package/lib/runner/index.mjs

@@ -631,7 +631,7 @@ async function runPlaywrightBatch(targetConfig, batch) {
   }
 
   console.log(
-    `\n── ${targetConfig.workerLabel} playwright:${targetConfig.name} (${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}) ──`
+    `\n── ${targetConfig.workerLabel} playwright:${targetConfig.name} (${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"})${formatPlaywrightBatchFiles(batch)} ──`
   );
 
   const cwd = resolveServiceCwd(targetConfig.productDir, local.cwd);
@@ -917,6 +917,15 @@ function formatBatchDescriptor(batch) {
   return frameworkLabel ? ` (${frameworkLabel}, ${fileLabel})` : ` (${fileLabel})`;
 }
 
+function formatPlaywrightBatchFiles(batch) {
+  if (!batch?.tasks?.length) return "";
+  const files = batch.tasks.map((task) => task.file);
+  if (files.length === 1) return ` · ${files[0]}`;
+  const preview = files.slice(0, 3).join(", ");
+  const suffix = files.length > 3 ? `, +${files.length - 3} more` : "";
+  return ` · ${preview}${suffix}`;
+}
+
 function formatFrameworkLabel(framework) {
   if (!framework || framework === "k6") return "";
   return framework;

package/lib/runner/planning.mjs

@@ -69,7 +69,9 @@ export function collectSuites(config, suiteType, suiteNames, frameworkFilter, fi
             ? Math.max(2, files.length)
             : Math.max(1, files.length)),
         maxFileConcurrency:
-          framework === "k6" ? suite.testkit?.maxFileConcurrency || 1 : 1,
+          framework === "k6" || framework === "playwright"
+            ? suite.testkit?.maxFileConcurrency || 1
+            : 1,
       });
       orderIndex += 1;
     }
@@ -183,9 +185,7 @@ export function buildTaskQueue(servicePlans, graphs, timings) {
           timingKey,
           estimatedDurationMs: estimateTaskDuration(timings, timingKey, suite),
           maxBatchSize:
-            suite.framework === "playwright"
-              ? Number.POSITIVE_INFINITY
-              : suite.maxFileConcurrency || 1,
+            suite.maxFileConcurrency || 1,
         });
         nextId += 1;
       }
@@ -213,20 +213,9 @@ export function claimNextBatch(queue, preferredGraphKey) {
   const seed = queue.splice(index, 1)[0];
   const tasks = [seed];
 
-  if (seed.framework === "playwright") {
-    for (let cursor = queue.length - 1; cursor >= 0; cursor -= 1) {
-      const candidate = queue[cursor];
-      if (
-        candidate.framework === "playwright" &&
-        candidate.graphKey === seed.graphKey &&
-        candidate.targetName === seed.targetName
-      ) {
-        tasks.push(candidate);
-        queue.splice(cursor, 1);
-      }
-    }
-  } else if (seed.maxBatchSize > 1) {
-    for (let cursor = queue.length - 1; cursor >= 0 && tasks.length < seed.maxBatchSize; cursor -= 1) {
+  if (seed.maxBatchSize > 1) {
+    for (let cursor = 0; cursor < queue.length; cursor += 1) {
+      if (tasks.length >= seed.maxBatchSize) break;
       const candidate = queue[cursor];
       if (
         candidate.framework === seed.framework &&
@@ -237,6 +226,7 @@ export function claimNextBatch(queue, preferredGraphKey) {
       ) {
         tasks.push(candidate);
         queue.splice(cursor, 1);
+        cursor -= 1;
       }
     }
   }

package/lib/runner/planning.test.mjs

@@ -137,11 +137,51 @@ describe("runner-planning", () => {
     expect(queue).toHaveLength(4);
 
     const firstBatch = claimNextBatch(queue, "api|frontend");
-    expect(firstBatch.tasks).toHaveLength(2);
+    expect(firstBatch.tasks).toHaveLength(1);
     expect(firstBatch.framework).toBe("playwright");
 
     const secondBatch = claimNextBatch(queue, "api|frontend");
-    expect(secondBatch.tasks).toHaveLength(2);
-    expect(secondBatch.framework).toBe("k6");
+    expect(secondBatch.tasks).toHaveLength(1);
+    expect(secondBatch.framework).toBe("playwright");
+
+    const thirdBatch = claimNextBatch(queue, "api|frontend");
+    expect(thirdBatch.tasks).toHaveLength(2);
+    expect(thirdBatch.framework).toBe("k6");
+  });
+
+  it("allows Playwright suites to opt into bounded multi-file batches", () => {
+    const frontend = makeConfig("frontend");
+    const plans = [
+      {
+        config: frontend,
+        skipped: false,
+        runtimeConfigs: [frontend],
+        runtimeNames: ["frontend"],
+        runtimeKey: "frontend",
+        suites: [
+          {
+            name: "auth",
+            type: "e2e",
+            framework: "playwright",
+            files: ["a.spec.js", "b.spec.js", "c.spec.js"],
+            orderIndex: 0,
+            weight: 3,
+            maxFileConcurrency: 2,
+          },
+        ],
+      },
+    ];
+
+    const graphs = buildRuntimeGraphs(plans);
+    const queue = buildTaskQueue(plans, graphs, { files: {} });
+
+    const firstBatch = claimNextBatch(queue, "frontend");
+    expect(firstBatch.tasks.map((task) => task.file)).toEqual(["a.spec.js", "b.spec.js"]);
+    expect(firstBatch.tasks).toHaveLength(2);
+    expect(firstBatch.framework).toBe("playwright");
+
+    const secondBatch = claimNextBatch(queue, "frontend");
+    expect(secondBatch.tasks).toHaveLength(1);
+    expect(secondBatch.framework).toBe("playwright");
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "types": "./lib/index.d.ts",