more build updates

Author: AndreasArvidsson

.vscode/tasks.json

@@ -31,7 +31,7 @@
     {
       "label": "Build test harness",
       "type": "npm",
-      "script": "bundle",
+      "script": "build",
       "path": "packages/test-harness",
       "presentation": {
         "reveal": "silent"

packages/test-harness/package.json

@@ -15,23 +15,15 @@
   "scripts": {
     "typecheck": "tsc",
     "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
-    "test": "c-tsx ./src/scripts/runUnitTestsOnly.ts",
-    "test:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --subset",
-    "test:update": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update",
-    "test:update:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update --subset",
+    "test": "c-tsx ./src/scripts/runUnitTests.ts",
+    "test:subset": "c-tsx ./src/scripts/runUnitTests.ts --subset",
+    "test:update": "c-tsx ./src/scripts/runUnitTests.ts --update",
+    "test:update:subset": "c-tsx ./src/scripts/runUnitTests.ts --update --subset",
     "test:vscode": "c-tsx ./src/scripts/runVscodeTestsCI.ts",
     "test:neovim": "c-tsx ./src/scripts/runNeovimTestsCI.ts",
     "test:talon": "c-tsx ./src/scripts/runTalonTests.ts",
     "test:talonJs": "c-tsx ./src/scripts/runTalonJsTests.ts",
-    "pretest": "pnpm run bundle",
-    "pretest:subset": "pnpm run bundle",
-    "pretest:update": "pnpm run bundle",
-    "pretest:update:subset": "pnpm run bundle",
-    "pretest:vscode": "pnpm run bundle",
-    "pretest:neovim": "pnpm run bundle",
-    "pretest:talon": "pnpm run bundle",
-    "pretest:talonJs": "pnpm run bundle",
-    "bundle": "bash ./scripts/compile-esbuild.sh",
+    "build": "bash ./scripts/compile-esbuild.sh",
     "generate-test-subset-file": "c-tsx ./src/scripts/generateTestSubsetFile.ts --always-open",
     "generate-test-subset-file-strict": "c-tsx ./src/scripts/generateTestSubsetFile.ts --fail-if-not-exists"
   },

packages/test-harness/src/launchVscodeAndRunTests.ts

@@ -69,6 +69,9 @@ export async function launchVscodeAndRunTests(extensionTestsPath: string) {
       vscodeExecutablePath,
       extensionDevelopmentPath,
       extensionTestsPath,
+      extensionTestsEnv: {
+        ["CURSORLESS_MODE"]: "test",
+      },
       // Note: Crash dump causes legacy VSCode and Windows to hang, so we just
       // don't bother.  Can be re-enabled if we ever need it; on windows it only
       // hangs some of the time, so might be enough to get a crash dump when you

packages/test-harness/src/runAllTests.ts

@@ -30,6 +30,8 @@ export enum TestType {
 }
 
 export function runAllTests(type: TestType): Promise<void> {
+  parseArgumentsAndUpdateEnv();
+
   return runTestsInDir(
     path.join(getCursorlessRepoRoot(), "packages"),
     (files) =>
@@ -68,6 +70,12 @@ async function runTestsInDir(
 
   const files = filterFiles(await glob("**/**.test.cjs", { cwd: testRoot }));
 
+  if (files.length === 0) {
+    throw new Error(
+      `No test files found. Do you need to run "pnpm run build" first?`,
+    );
+  }
+
   // Add files to the test suite
   files.forEach((f) => mocha.addFile(path.resolve(testRoot, f)));
 
@@ -97,3 +105,17 @@ async function runTestsInDir(
     throw err;
   }
 }
+
+function parseArgumentsAndUpdateEnv() {
+  const args = new Set(process.argv.slice(2));
+
+  process.env.CURSORLESS_MODE = "test";
+
+  if (args.has("--subset")) {
+    process.env.CURSORLESS_RUN_TEST_SUBSET = "true";
+  }
+
+  if (args.has("--update")) {
+    process.env.CURSORLESS_TEST_UPDATE_FIXTURES = "true";
+  }
+}

packages/test-harness/src/scripts/runNeovimTestsCI.ts

@@ -4,8 +4,6 @@
 
 import { launchNeovimAndRunTests } from "../launchNeovimAndRunTests";
 
-process.env.CURSORLESS_MODE = "test";
-
 void (async () => {
   await launchNeovimAndRunTests();
 })();

packages/test-harness/src/scripts/runTalonJsTests.ts

@@ -2,14 +2,8 @@
  * Runs all Talon everywhere/JS tests.
  */
 
-process.env.CURSORLESS_MODE = "test";
-
 void (async () => {
   const { TestType, runAllTests } = await import("../runAllTests");
 
-  try {
-    await runAllTests(TestType.talonJs);
-  } catch (_ex) {
-    process.exit(1);
-  }
+  await runAllTests(TestType.talonJs);
 })();

packages/test-harness/src/scripts/runTalonTests.ts

@@ -1,6 +1,9 @@
 /**
  * Runs all Talon tests.
  */
-import { TestType, runAllTests } from "../runAllTests";
 
-void runAllTests(TestType.talon);
+void (async () => {
+  const { TestType, runAllTests } = await import("../runAllTests");
+
+  await runAllTests(TestType.talon);
+})();

packages/test-harness/src/scripts/runUnitTests.ts

@@ -0,0 +1,9 @@
+/**
+ * Runs all tests that don't have to be run within a particular environment.
+ */
+
+void (async () => {
+  const { TestType, runAllTests } = await import("../runAllTests");
+
+  await runAllTests(TestType.unit);
+})();

packages/test-harness/src/scripts/runUnitTestsOnly.ts

@@ -6,8 +6,6 @@ import { getCursorlessRepoRoot } from "@cursorless/node-common";
 import * as path from "node:path";
 import { launchVscodeAndRunTests } from "../launchVscodeAndRunTests";
 
-process.env.CURSORLESS_MODE = "test";
-
 void (async () => {
   const extensionTestsPath = path.resolve(
     getCursorlessRepoRoot(),