chore: cleanup tests

aurelia · Aug 10, 2024 · 88f374f · 88f374f
1 parent 4cb5367
commit 88f374f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/app-min/test__if_not_no-unit-tests/my-app.spec.ext b/app-min/test__if_not_no-unit-tests/my-app.spec.ext
@@ -3,17 +3,15 @@ import { describe, it } from 'vitest';
 // @endif
 import { MyApp } from '../src/my-app';
 import { createFixture } from '@aurelia/testing';
-import './setup';
 
 describe('my-app', () => {
   it('should render message', async () => {
-    const { assertText, startPromise } = createFixture(
+    const { assertText } = await createFixture(
       '<my-app></my-app>',
       {},
       [MyApp],
-    );
+    ).started;
 
-    await startPromise;
     assertText('Hello World!', { compact: true });
   });
 });
diff --git a/common/test__if_not_no-unit-tests/setup.ext b/common/test__if_not_no-unit-tests/setup.ext
@@ -20,6 +20,12 @@ beforeAll(() => {
 });
 
 afterEach(() => {
-  fixtures.forEach(f => f.stop(true));
+  fixtures.forEach(async f => {
+    try {
+      await f.stop(true);
+    } catch {
+      // ignore
+    }
+  });
   fixtures.length = 0;
 });
diff --git a/jest/package.json b/jest/package.json
@@ -19,6 +19,7 @@
       "<rootDir>/test/**/*.spec./* @if babel */js/* @endif *//* @if typescript */ts/* @endif */"
     ],
     "testEnvironment": "jsdom",
+    "setupFilesAfterEnv": ["./test/setup./* @if babel */js/* @endif *//* @if typescript */ts/* @endif */"],
     "transform": {
       "\\.(css|sass|scss|styl|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "jest-transform-stub",
       // @if babel

diff --git a/parcel/test__if_jasmine_or_mocha/all-spec.ext b/parcel/test__if_jasmine_or_mocha/all-spec.ext
diff --git a/plugin-min/test__if_not_no-unit-tests/hello-world.spec.ext b/plugin-min/test__if_not_no-unit-tests/hello-world.spec.ext
@@ -3,17 +3,15 @@ import { describe, it } from 'vitest';
 // @endif
 import { HelloWorld } from '../src/hello-world';
 import { createFixture } from '@aurelia/testing';
-import './setup';
 
 describe('my-app', () => {
   it('should render message', async () => {
-    const { assertText, startPromise } = createFixture(
+    const { assertText } = await createFixture(
       '<hello-world message="message"></hello-world>',
       { message: "foo" },
       [HelloWorld],
-    );
+    ).started;
 
-    await startPromise;
     assertText('Hello World! foo', { compact: true });
   });
 });
diff --git a/vite/vitest.config.ext__if_vitest b/vite/vitest.config.ext__if_vitest
@@ -12,6 +12,7 @@ export default mergeConfig(
       exclude: [...configDefaults.exclude, "e2e/*"],
       // @endif
       root: fileURLToPath(new URL("./", import.meta.url)),
+      setupFiles: ["./test/setup./* @if babel */js/* @endif *//* @if typescript */ts/* @endif */"]
     },
   }),
 );
diff --git a/webpack/test__if_jasmine_or_mocha/all-spec.ext b/webpack/test__if_jasmine_or_mocha/all-spec.ext