Run all vitests as electron

Author: EhabY

.github/workflows/ci.yaml

@@ -46,8 +46,6 @@ jobs:
 
       - run: yarn test:ci
 
-      - run: yarn test:electron
-
   package:
     name: Package
     runs-on: ubuntu-22.04

.vscode/settings.json

@@ -10,5 +10,9 @@
 	},
 	"[jsonc]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	}
+	},
+	"vitest.nodeEnv": {
+		"ELECTRON_RUN_AS_NODE": "1"
+	},
+	"vitest.nodeExecutable": "node_modules/.bin/electron"
 }

package.json

@@ -25,9 +25,8 @@
 		"package": "webpack --mode production --devtool hidden-source-map",
 		"package:prerelease": "npx vsce package --pre-release",
 		"pretest": "tsc -p . --outDir out && tsc -p test --outDir out && yarn run build && yarn run lint",
-		"test": "vitest",
+		"test": "ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs",
 		"test:ci": "CI=true yarn test",
-		"test:electron": "ELECTRON_RUN_AS_NODE=1 electron node_modules/vitest/vitest.mjs test/unit/error.test.ts",
 		"test:integration": "vscode-test",
 		"vscode:prepublish": "yarn package",
 		"watch": "webpack --watch"

test/unit/error.test.ts

@@ -12,11 +12,13 @@ describe("Certificate errors", () => {
 	// Before each test we make a request to sanity check that we really get the
 	// error we are expecting, then we run it through CertificateError.
 
-	// Some tests behave differently in Electron (BoringSSL) vs Node.js (OpenSSL).
-	// Run `yarn test:electron` to test Electron-specific behavior.
-	const isElectron =
-		(process.versions.electron || process.env.ELECTRON_RUN_AS_NODE) &&
-		!process.env.VSCODE_PID; // Running from the test explorer in VS Code
+	// These tests run in Electron (BoringSSL) for accurate certificate validation testing.
+
+	it("should run in Electron environment", () => {
+		const isElectron =
+			process.versions.electron || process.env.ELECTRON_RUN_AS_NODE;
+		expect(isElectron).toBeTruthy();
+	});
 
 	beforeAll(() => {
 		vi.mock("vscode", () => {
@@ -121,26 +123,16 @@ describe("Certificate errors", () => {
 				servername: "localhost",
 			}),
 		});
-		if (isElectron) {
-			await expect(request).rejects.toHaveProperty(
-				"code",
-				X509_ERR_CODE.UNABLE_TO_VERIFY_LEAF_SIGNATURE,
-			);
-			try {
-				await request;
-			} catch (error) {
-				const wrapped = await CertificateError.maybeWrap(
-					error,
-					address,
-					logger,
-				);
-				expect(wrapped instanceof CertificateError).toBeTruthy();
-				expect((wrapped as CertificateError).x509Err).toBe(
-					X509_ERR.NON_SIGNING,
-				);
-			}
-		} else {
-			await expect(request).resolves.toHaveProperty("data", "foobar");
+		await expect(request).rejects.toHaveProperty(
+			"code",
+			X509_ERR_CODE.UNABLE_TO_VERIFY_LEAF_SIGNATURE,
+		);
+		try {
+			await request;
+		} catch (error) {
+			const wrapped = await CertificateError.maybeWrap(error, address, logger);
+			expect(wrapped instanceof CertificateError).toBeTruthy();
+			expect((wrapped as CertificateError).x509Err).toBe(X509_ERR.NON_SIGNING);
 		}
 	});