diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5afe63ea665..317a1327e10 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -103,17 +103,12 @@ jobs: if: runner.os != 'Linux' - name: Run QuickJS tests (Linux) - run: xvfb-run -a pnpm -F @cursorless/test-talon-e2e test:quickjs + run: xvfb-run -a pnpm -F @cursorless/test-talonjs-e2e test:quickjs if: runner.os == 'Linux' && matrix.app_version == 'stable' - - name: Run QuickJS tests (Win) - run: pnpm -F @cursorless/test-talon-e2e test:quickjs - if: runner.os == 'Windows' - - # QuickJS tests are currently broken on Mac, so we disable them for now. - # - name: Run QuickJS tests (Win,Mac) - # run: pnpm -F @cursorless/test-talon-e2e test:quickjs - # if: runner.os != 'Linux' + - name: Run QuickJS tests (Win,Mac) + run: pnpm -F @cursorless/test-talonjs-e2e test:quickjs + if: runner.os != 'Linux' - name: Create VSCode dist that can be installed locally run: pnpm -F @cursorless/app-vscode populate-dist --local-install diff --git a/packages/test-talon-e2e/package.json b/packages/test-talonjs-e2e/package.json similarity index 93% rename from packages/test-talon-e2e/package.json rename to packages/test-talonjs-e2e/package.json index 2ea41459fea..0169a81ed7e 100644 --- a/packages/test-talon-e2e/package.json +++ b/packages/test-talonjs-e2e/package.json @@ -1,5 +1,5 @@ { - "name": "@cursorless/test-talon-e2e", + "name": "@cursorless/test-talonjs-e2e", "version": "1.0.0", "description": "Our Talon everywhere/JS end-to-end tests", "license": "MIT", diff --git a/packages/test-talon-e2e/scripts/test-quickjs.sh b/packages/test-talonjs-e2e/scripts/test-quickjs.sh similarity index 87% rename from packages/test-talon-e2e/scripts/test-quickjs.sh rename to packages/test-talonjs-e2e/scripts/test-quickjs.sh index fd1e3e2afb3..d3f382eb2f5 100755 --- a/packages/test-talon-e2e/scripts/test-quickjs.sh +++ b/packages/test-talonjs-e2e/scripts/test-quickjs.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euox pipefail -QUICKJS_VERSION=2024-01-13 +QUICKJS_VERSION=2026-06-04 esbuild \ src/quickjsTest.ts \ @@ -18,9 +18,10 @@ cd out if [[ "$OSTYPE" == "darwin"* ]]; then brew install quickjs # Brew doesn't actually publish different versions of the quickjs binary + # https://formulae.brew.sh/formula/quickjs # brew install quickjs@$QUICKJS_VERSION - qjs -I quickjsTest.mjs + qjs -m quickjsTest.mjs exit 0 fi @@ -44,6 +45,6 @@ fi curl -o $QUICKJS_FILE $QUICKJS_URL -unzip $QUICKJS_FILE +unzip -o $QUICKJS_FILE -./qjs -I quickjsTest.mjs +./qjs -m quickjsTest.mjs diff --git a/packages/test-talon-e2e/src/constructTestHelpers.ts b/packages/test-talonjs-e2e/src/constructTestHelpers.ts similarity index 100% rename from packages/test-talon-e2e/src/constructTestHelpers.ts rename to packages/test-talonjs-e2e/src/constructTestHelpers.ts diff --git a/packages/test-talon-e2e/src/endToEndTestSetUp.ts b/packages/test-talonjs-e2e/src/endToEndTestSetUp.ts similarity index 100% rename from packages/test-talon-e2e/src/endToEndTestSetUp.ts rename to packages/test-talonjs-e2e/src/endToEndTestSetUp.ts diff --git a/packages/test-talon-e2e/src/quickjsTest.ts b/packages/test-talonjs-e2e/src/quickjsTest.ts similarity index 100% rename from packages/test-talon-e2e/src/quickjsTest.ts rename to packages/test-talonjs-e2e/src/quickjsTest.ts diff --git a/packages/test-talon-e2e/src/recorded.talonjs.test.ts b/packages/test-talonjs-e2e/src/recorded.talonjs.test.ts similarity index 100% rename from packages/test-talon-e2e/src/recorded.talonjs.test.ts rename to packages/test-talonjs-e2e/src/recorded.talonjs.test.ts diff --git a/packages/test-talon-e2e/src/talonMock.ts b/packages/test-talonjs-e2e/src/talonMock.ts similarity index 100% rename from packages/test-talon-e2e/src/talonMock.ts rename to packages/test-talonjs-e2e/src/talonMock.ts diff --git a/packages/test-talon-e2e/src/types/cursorless.ts b/packages/test-talonjs-e2e/src/types/cursorless.ts similarity index 100% rename from packages/test-talon-e2e/src/types/cursorless.ts rename to packages/test-talonjs-e2e/src/types/cursorless.ts diff --git a/packages/test-talon-e2e/src/types/std.d.ts b/packages/test-talonjs-e2e/src/types/std.d.ts similarity index 100% rename from packages/test-talon-e2e/src/types/std.d.ts rename to packages/test-talonjs-e2e/src/types/std.d.ts diff --git a/packages/test-talon-e2e/src/types/talon.ts b/packages/test-talonjs-e2e/src/types/talon.ts similarity index 100% rename from packages/test-talon-e2e/src/types/talon.ts rename to packages/test-talonjs-e2e/src/types/talon.ts diff --git a/packages/test-talon-e2e/tsconfig.json b/packages/test-talonjs-e2e/tsconfig.json similarity index 100% rename from packages/test-talon-e2e/tsconfig.json rename to packages/test-talonjs-e2e/tsconfig.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c960d6c00a8..d06f8f20ff4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -685,7 +685,7 @@ importers: specifier: ^4.23.12 version: 4.23.12 - packages/test-talon-e2e: + packages/test-talonjs-e2e: dependencies: '@cursorless/lib-common': specifier: workspace:* diff --git a/tsconfig.json b/tsconfig.json index c002ac6c4f8..9b7b8c47295 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -63,7 +63,7 @@ "path": "./packages/test-runner" }, { - "path": "./packages/test-talon-e2e" + "path": "./packages/test-talonjs-e2e" }, { "path": "./packages/test-vscode-e2e"