Moved afterEach into the driver

Otherwise the cleanup happens in a non deterministic order

Author: johnsimons

src/Frontend/test/drivers/vitest/driver.ts

@@ -1,10 +1,11 @@
-import { it as itVitest, describe } from "vitest";
+import { test as testVitest, describe } from "vitest";
 import { Driver } from "../../driver";
 import { mount } from "@/mount";
 import makeRouter from "../../../src/router";
 import { mockEndpoint, mockEndpointDynamic } from "../../utils";
-import { mockServer } from "../../mock-server";
 import { App } from "vue";
+import { mockServer } from "../../mock-server";
+import flushPromises from "flush-promises";
 
 function makeDriver() {
   let app: App<Element>;
@@ -37,18 +38,38 @@ function makeDriver() {
   return driver;
 }
 
-const test = itVitest.extend<{ driver: Driver }>({
+function deleteAllCookies() {
+  const cookies = document.cookie.split(";");
+
+  for (let i = 0; i < cookies.length; i++) {
+    const cookie = cookies[i];
+    const eqPos = cookie.indexOf("=");
+    const name = eqPos > -1 ? cookie.slice(0, eqPos) : cookie;
+    document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
+  }
+}
+
+const test = testVitest.extend<{ driver: Driver }>({
   // eslint-disable-next-line no-empty-pattern, @typescript-eslint/no-explicit-any
   driver: async ({}, use: any) => {
-    //Reset the mocked handlers before executing the test
-    mockServer.resetHandlers();
-
     const driver = makeDriver();
+    console.log("Starting test");
+
     //run the test
     await use(driver);
 
+    console.log("Test ended");
     //unmount the app after the test runs
+    await flushPromises();
     driver.disposeApp();
+
+    console.log("Cleanup after test");
+    mockServer.resetHandlers();
+    //Make JSDOM create a fresh document per each test run
+    jsdom.reconfigure({ url: "http://localhost:3000/" });
+    localStorage.clear();
+    sessionStorage.clear();
+    deleteAllCookies();
   },
 });
 

src/Frontend/test/drivers/vitest/setup.ts

@@ -1,4 +1,4 @@
-import { afterAll, afterEach, beforeAll, beforeEach, vi } from "vitest";
+import { afterAll, beforeAll, beforeEach, vi } from "vitest";
 import { mockServer } from "../../mock-server";
 import "@testing-library/jest-dom/vitest";
 
@@ -14,13 +14,13 @@ export function disableMonitoring() {
   vi.stubGlobal("defaultConfig", { ...defaultConfig, ...{ monitoring_urls: ["!"] } });
 }
 
-vi.stubGlobal("defaultConfig", defaultConfig);
-
 beforeEach(() => {
   vi.stubGlobal("defaultConfig", defaultConfig);
 });
 
 beforeAll(() => {
+  console.log("Starting mock server");
+
   mockServer.listen({
     onUnhandledRequest: (request, { error }) => {
       console.log("Unhandled %s %s", request.method, request.url);
@@ -29,28 +29,7 @@ beforeAll(() => {
   });
 });
 
-afterAll(async () => {
-  //Intentionally not calling mockServer.close here to prevent ServicePulse in flight messages after app unmount to fail
-});
-
-function deleteAllCookies() {
-  const cookies = document.cookie.split(";");
-
-  for (let i = 0; i < cookies.length; i++) {
-    const cookie = cookies[i];
-    const eqPos = cookie.indexOf("=");
-    const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
-    document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
-  }
-}
-
-afterEach(() => {
-  //Intentionally not calling mockServer.resetHandlers here to prevent ServicePulse in flight messages after app unmount to fail.
-  //mockServer.resetHandlers is being called instead in driver.ts
-
-  //Make JSDOM create a fresh document per each test run
-  jsdom.reconfigure({ url: "http://localhost:3000/" });
-  localStorage.clear();
-  sessionStorage.clear();
-  deleteAllCookies();
+afterAll(() => {
+  console.log("Shutting down mock server");
+  mockServer.close();
 });