Merge pull request #578 from typed-ember/bye-jest

Author: dfreeman

packages/environment-ember-template-imports/.gitignore

@@ -2,6 +2,5 @@
 *.d.ts
 tsconfig.tsbuildinfo
 
-!jest.config.js
 !-private/dsl/**/*.d.ts
 !globals/**/*.d.ts

packages/template/__tests__/tsconfig.json

@@ -2,6 +2,6 @@
   "extends": "../../../tsconfig.compileroptions.json",
   "compilerOptions": {
     "noEmit": true,
-    "lib": ["dom"]
+    "lib": ["es2020", "dom"]
   }
 }

packages/vscode/.vscodeignore

@@ -12,6 +12,4 @@ lib/
 tsconfig.json
 tsconfig.tsbuildinfo
 
-jest.config.mjs
-
 node_modules/

packages/vscode/__tests__/smoketest-ember.test.ts

@@ -12,12 +12,12 @@ import {
   workspace,
 } from 'vscode';
 import * as path from 'path';
+import { describe, afterEach, test } from 'mocha';
+import { expect } from 'expect';
 import { waitUntil } from './helpers/async';
 
 describe('Smoke test: Ember', () => {
-  jest.setTimeout(30_000);
-
-  const rootDir = path.resolve(__dirname, '../__fixtures__/ember-app');
+  const rootDir = path.resolve(__dirname, '../../__fixtures__/ember-app');
 
   afterEach(async () => {
     while (window.activeTextEditor) {

packages/vscode/__tests__/smoketest-js-glimmerx.test.ts

@@ -10,12 +10,12 @@ import {
   workspace,
 } from 'vscode';
 import * as path from 'path';
+import { describe, afterEach, test } from 'mocha';
+import { expect } from 'expect';
 import { waitUntil } from './helpers/async';
 
 describe('Smoke test: js-glimmerx', () => {
-  jest.setTimeout(30_000);
-
-  const rootDir = path.resolve(__dirname, '../__fixtures__/js-glimmerx-app');
+  const rootDir = path.resolve(__dirname, '../../__fixtures__/js-glimmerx-app');
 
   afterEach(async () => {
     while (window.activeTextEditor) {

packages/vscode/__tests__/smoketest-template-imports.test.ts

@@ -10,12 +10,12 @@ import {
   workspace,
 } from 'vscode';
 import * as path from 'path';
+import { describe, afterEach, test } from 'mocha';
+import { expect } from 'expect';
 import { waitUntil } from './helpers/async';
 
 describe('Smoke test: ETI Environment', () => {
-  jest.setTimeout(30_000);
-
-  const rootDir = path.resolve(__dirname, '../__fixtures__/template-imports-app');
+  const rootDir = path.resolve(__dirname, '../../__fixtures__/template-imports-app');
 
   afterEach(async () => {
     while (window.activeTextEditor) {

…de/__tests__/support/launch-from-cli.mjs …de/__tests__/support/launch-from-cli.mtspackages/vscode/__tests__/support/launch-from-cli.mjs renamed to packages/vscode/__tests__/support/launch-from-cli.mts packages/vscode/__tests__/support/launch-from-cli.mjs renamed to packages/vscode/__tests__/support/launch-from-cli.mts

@@ -1,17 +1,16 @@
-// @ts-check
-
-import path from 'node:path';
-import os from 'node:os';
+import * as path from 'node:path';
+import * as os from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { runTests } from '@vscode/test-electron';
 
 const dirname = path.dirname(fileURLToPath(import.meta.url));
+const packageRoot = path.resolve(dirname, '../../..');
 const emptyTempDir = path.join(os.tmpdir(), `user-data-${Math.random()}`);
 
 try {
   await runTests({
-    extensionDevelopmentPath: path.resolve(dirname, '../..'),
-    extensionTestsPath: path.resolve(dirname, 'vscode-runner.cjs'),
+    extensionDevelopmentPath: packageRoot,
+    extensionTestsPath: path.resolve(dirname, 'vscode-runner.js'),
     launchArgs: [
       // Don't show the "hey do you trust this folder?" prompt
       '--disable-workspace-trust',
@@ -25,9 +24,9 @@ try {
       '--user-data-dir',
       emptyTempDir,
       // Load the app fixtures
-      `${dirname}/../../__fixtures__/ember-app`,
-      `${dirname}/../../__fixtures__/js-glimmerx-app`,
-      `${dirname}/../../__fixtures__/template-imports-app`,
+      `${packageRoot}/__fixtures__/ember-app`,
+      `${packageRoot}/__fixtures__/js-glimmerx-app`,
+      `${packageRoot}/__fixtures__/template-imports-app`,
     ],
   });
 } catch (error) {

packages/vscode/__tests__/support/vscode-jest-environment.cjs

@@ -0,0 +1,27 @@
+// This file is invoked by VSCode itself when configured to run extension
+// tests via the `--extensionTestsPath` flag.
+
+import * as path from 'node:path';
+import * as glob from 'glob';
+import Mocha = require('mocha');
+
+export function run(runner: unknown, callback: (error: unknown, failures?: number) => void): void {
+  try {
+    let mocha = new Mocha({ color: true, slow: 3_000, timeout: 30_000 });
+    let tests = path.resolve(__dirname, '..').replace(/\\/g, '/');
+
+    for (let testFile of glob.sync(`${tests}/**/*.test.js`)) {
+      if (process.platform === 'win32') {
+        // Mocha is weird about drive letter casing under Windows
+        testFile = testFile[0].toLowerCase() + testFile.slice(1);
+      }
+
+      mocha.addFile(testFile);
+    }
+
+    mocha.run((failures) => callback(null, failures));
+  } catch (error) {
+    console.error(error);
+    callback(error);
+  }
+}