fix(ci): preserve Vitest spec files in cached shards

Author: juliusmarminge

scripts/lib/cached-tests.test.ts

@@ -48,6 +48,13 @@ describe("cachedTestTasks", () => {
     }
   });
 
+  it("accepts spec files discovered by Vitest", () => {
+    const tasks = cachedTestTasks(JSON.stringify({ files: ["src/example.spec.ts"], groupSize: 1 }));
+    expect(
+      Object.values(tasks).some((task) => task.command === "vp test run 'src/example.spec.ts'"),
+    ).toBe(true);
+  });
+
   it("does not add tasks without an explicit request", () => {
     expect(cachedTestTasks(undefined)).toEqual({});
   });

scripts/lib/cached-tests.ts

@@ -50,7 +50,7 @@ export function cachedTestTasks(
       typeof file !== "string" ||
       NodePath.isAbsolute(file) ||
       file.split(/[\\/]/).includes("..") ||
-      !/\.test\.[cm]?[jt]sx?$/.test(file)
+      !/\.(?:test|spec)\.[cm]?[jt]sx?$/.test(file)
     ) {
       throw new Error("Cached tests must be test files inside the checkout");
     }

scripts/lib/sharded-tests.test.ts

@@ -26,13 +26,14 @@ it("uses the configured sequencer and discovers every file exactly once", async
            return files.sort((a,b)=>a.moduleId.localeCompare(b.moduleId)).filter((_,i)=>i%count===index-1);
          }
        }
-       export default {test:{include:["included/*.test.ts"],sequence:{sequencer:Sequencer}}};`,
+       export default {test:{include:["included/*.{test,spec}.ts"],sequence:{sequencer:Sequencer}}};`,
     );
     await NodeFSP.mkdir(NodePath.join(root, "included"));
     for (const file of [
       "included/a.test.ts",
       "included/b.test.ts",
       "included/c.test.ts",
+      "included/d.spec.ts",
       "excluded.test.ts",
     ]) {
       await NodeFSP.writeFile(NodePath.join(root, file), "export {};");
@@ -42,8 +43,11 @@ it("uses the configured sequencer and discovers every file exactly once", async
     expect(first).toEqual(
       ["a", "c"].map((file) => NodePath.join(root, `included/${file}.test.ts`)),
     );
-    expect(second).toEqual([NodePath.join(root, "included/b.test.ts")]);
-    expect(new Set([...first, ...second]).size).toBe(3);
+    expect(second).toEqual([
+      NodePath.join(root, "included/b.test.ts"),
+      NodePath.join(root, "included/d.spec.ts"),
+    ]);
+    expect(new Set([...first, ...second]).size).toBe(4);
     await expect(shardedTestFiles(root, "0/2")).rejects.toThrow("Shard must be");
   } finally {
     await NodeFSP.rm(root, { recursive: true, force: true });

scripts/test-cached.ts

@@ -49,13 +49,17 @@ const candidates = values.shard
       { cwd: root, encoding: "utf8", maxBuffer: 64 * 1024 * 1024 },
     ).split("\0");
 const filters = positionals.map((path) => NodePath.relative(root, NodePath.resolve(path)));
-const files = [...new Set(candidates)].filter(
-  (file) =>
-    /\.test\.[cm]?[jt]sx?$/.test(file) &&
-    !file.startsWith(".repos/") &&
-    NodeFS.existsSync(NodePath.join(root, file)) &&
-    matchesTestPath(file, filters),
-);
+const isSelectable = (file: string) =>
+  /\.(?:test|spec)\.[cm]?[jt]sx?$/.test(file) &&
+  !file.startsWith(".repos/") &&
+  NodeFS.existsSync(NodePath.join(root, file)) &&
+  matchesTestPath(file, filters);
+if (values.shard) {
+  const rejected = candidates.filter((file) => !isSelectable(file));
+  if (rejected.length)
+    throw new Error(`Discovered tests cannot be selected: ${rejected.join(", ")}`);
+}
+const files = [...new Set(candidates)].filter(isSelectable);
 if (files.length === 0) {
   console.error("No test files matched");
   process.exit(values.shard ? 0 : 1);