Tidy unsaved-changes guard tests

Author: MindFreeze

test/common/navigate.test.ts

@@ -66,16 +66,20 @@ describe("navigate", () => {
 describe("unsaved changes guard", () => {
   const registeredGuards: UnsavedChangesGuard[] = [];
 
-  const registerGuard = (isDirty: boolean, promptResult = true) => {
-    const guard = {
-      isDirty: vi.fn(() => isDirty),
-      prompt: vi.fn(async () => promptResult),
-    };
+  // Registering through this keeps afterEach able to clean up the module-level
+  // registry, which outlives the test that filled it.
+  const trackGuard = <T extends UnsavedChangesGuard>(guard: T): T => {
     registerUnsavedChangesGuard(guard);
     registeredGuards.push(guard);
     return guard;
   };
 
+  const registerGuard = (isDirty: boolean, promptResult = true) =>
+    trackGuard({
+      isDirty: vi.fn(() => isDirty),
+      prompt: vi.fn(async () => promptResult),
+    });
+
   beforeEach(() => {
     setEntry("/config");
   });
@@ -126,17 +130,15 @@ describe("unsaved changes guard", () => {
   it("skips a pending prompt once no guard is dirty anymore", async () => {
     let dirty = true;
     let resolvePrompt!: (value: boolean) => void;
-    const guard: UnsavedChangesGuard = {
+    const guard = trackGuard({
       isDirty: () => dirty,
       prompt: vi.fn(
         () =>
           new Promise<boolean>((resolve) => {
             resolvePrompt = resolve;
           })
       ),
-    };
-    registerUnsavedChangesGuard(guard);
-    registeredGuards.push(guard);
+    });
 
     const first = navigate("/config/areas");
     dirty = false;
@@ -151,17 +153,15 @@ describe("unsaved changes guard", () => {
 
   it("shares one pending prompt between concurrent navigations", async () => {
     let resolvePrompt!: (value: boolean) => void;
-    const guard: UnsavedChangesGuard = {
+    const guard = trackGuard({
       isDirty: () => true,
       prompt: vi.fn(
         () =>
           new Promise<boolean>((resolve) => {
             resolvePrompt = resolve;
           })
       ),
-    };
-    registerUnsavedChangesGuard(guard);
-    registeredGuards.push(guard);
+    });
 
     const first = navigate("/config/areas");
     const second = navigate("/config/devices/dashboard");

test/mixins/prevent-unsaved-mixin.test.ts

@@ -52,9 +52,7 @@ const setEntry = (path: string) => {
 };
 
 const mountClean = async () => {
-  const element = document.createElement(
-    "test-prevent-unsaved"
-  ) as TestPreventUnsaved;
+  const element = document.createElement("test-prevent-unsaved");
   document.body.append(element);
   element.initialize({ name: "Kitchen" });
   await element.updateComplete;
@@ -77,7 +75,6 @@ describe("PreventUnsavedMixin", () => {
     document.querySelectorAll("test-prevent-unsaved").forEach((element) => {
       element.remove();
     });
-    window.isDirtyState = false;
   });
 
   it("blocks navigation while dirty when the prompt is declined", async () => {