fix: fix au2 mocha setup

3cp · 3cp · commit 3c2cb628e435 · 2024-12-19T17:36:41.000+10:00
diff --git a/client/src/skeletons/aurelia2.js b/client/src/skeletons/aurelia2.js
@@ -50,7 +50,7 @@ const appTs = `export class MyApp {
 }
 `;
 
-const testSetup = ext => `import { BrowserPlatform } from '@aurelia/platform-browser';
+const jasmineSetup = ext => `import { BrowserPlatform } from '@aurelia/platform-browser';
 import { setPlatform, onFixtureCreated${ext === '.ts' ? ', type IFixture' : ''} } from '@aurelia/testing';
 
 // Sets up the Aurelia environment for testing
@@ -80,6 +80,39 @@ afterEach(() => {
 });
 `;
 
+const mochaSetup = ext => `import { BrowserPlatform } from '@aurelia/platform-browser';
+import { setPlatform, onFixtureCreated${ext === '.ts' ? ', type IFixture' : ''} } from '@aurelia/testing';
+
+// Sets up the Aurelia environment for testing
+function bootstrapTextEnv() {
+  const platform = new BrowserPlatform(window);
+  setPlatform(platform);
+  BrowserPlatform.set(globalThis, platform);
+}
+
+const fixtures${ext === '.ts' ? ': IFixture<object>[]' : ''} = [];
+mocha.setup({
+  rootHooks: {
+    beforeAll() {
+      bootstrapTextEnv();
+      onFixtureCreated(fixture => {
+        fixtures.push(fixture);
+      });
+    },
+    afterEach() {
+      fixtures.forEach(async f => {
+        try {
+          await f.stop(true);
+        } catch {
+          // ignore
+        }
+      });
+      fixtures.length = 0;
+    }
+  }
+});
+`;
+
 const jasmineTest = `import { createFixture } from '@aurelia/testing';
 import { MyApp } from '../src/my-app';
 
@@ -137,23 +170,26 @@ export default function({transpiler, testFramework}) {
     }
   ];
 
-  if (testFramework !== 'none') {
-    files.push({
-      filename: `test/setup${ext}`,
-      content: testSetup(ext)
-    });
-
-    if (testFramework === 'jasmine') {
-      files.push({
+  if (testFramework === 'jasmine') {
+    files.push(
+      {
+        filename: `test/setup${ext}`,
+        content: jasmineSetup(ext)
+      }, {
         filename: `test/app.spec${ext}`,
         content: jasmineTest
-      });
-    } else if (testFramework === 'mocha') {
-      files.push({
+      }
+    );
+  } else if (testFramework === 'mocha') {
+    files.push(
+      {
+        filename: `test/setup${ext}`,
+        content: mochaSetup(ext)
+      }, {
         filename: `test/app.spec${ext}`,
         content: mochaTest
-      });
-    }
+      }
+    );
   }
 
   return files;
diff --git a/client/src/skeletons/skeleton-generator.js b/client/src/skeletons/skeleton-generator.js
@@ -60,13 +60,14 @@ const DEFAULT_MOCHA_INDEX_HTML = `<!DOCTYPE html>
 <head>
 <meta charset="utf-8">
 <title>Unit Tests</title>
-<link rel="stylesheet" href="//${JSDELIVR_CDN_DOMAIN}/npm/mocha@7/mocha.css">
+<link rel="stylesheet" href="//${JSDELIVR_CDN_DOMAIN}/npm/mocha/mocha.css">
 </head>
 <body>
 <div id="mocha"></div>
-<script src="//${JSDELIVR_CDN_DOMAIN}/npm/mocha@7/mocha.js"></script>
+<script src="//${JSDELIVR_CDN_DOMAIN}/npm/mocha/mocha.js"></script>
 <script class="mocha-init">
-mocha.setup({ui: "bdd", reporter: "html"});
+mocha.setup('bdd');
+mocha.checkLeaks();
 </script>
 <script src="/dist/entry-bundle.js"></script>
 <script>
