chore: clean up WorkspaceMonitor and Inbox tests

- Remove unnecessary dispose() calls from tests that don't test dispose
- Combine two "before initial setup" tests into one
- Import ContextManager type properly instead of inline import()
- Improve test names to describe behavior more precisely

Author: EhabY

test/unit/inbox.test.ts

@@ -58,39 +58,37 @@ describe("Inbox", () => {
 	}
 
 	describe("message handling", () => {
-		it("shows notification when a message arrives", async () => {
-			const { inbox, stream } = await createInbox();
+		it("shows notification with the message title", async () => {
+			const { stream } = await createInbox();
 
 			stream.pushMessage(createNotification("Out of memory"));
 
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith(
 				"Out of memory",
 			);
-			inbox.dispose();
 		});
 
-		it("shows multiple notifications for successive messages", async () => {
-			const { inbox, stream } = await createInbox();
+		it("shows each notification independently (no dedup)", async () => {
+			const { stream } = await createInbox();
 
 			stream.pushMessage(createNotification("First alert"));
 			stream.pushMessage(createNotification("Second alert"));
 
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledTimes(2);
-			inbox.dispose();
 		});
 
 		it("logs parse errors without showing notifications", async () => {
-			const { inbox, stream } = await createInbox();
+			const { stream } = await createInbox();
 
 			stream.pushError(new Error("bad json"));
 
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			inbox.dispose();
 		});
 
 		it("closes the socket on dispose", async () => {
 			const stream = new MockEventStream<GetInboxNotificationResponse>();
 			const { inbox } = await createInbox(stream);
+
 			inbox.dispose();
 
 			expect(stream.stream.close).toHaveBeenCalled();
@@ -100,17 +98,16 @@ describe("Inbox", () => {
 	describe("disableNotifications", () => {
 		it("suppresses notifications when enabled", async () => {
 			config.set("coder.disableNotifications", true);
-			const { inbox, stream } = await createInbox();
+			const { stream } = await createInbox();
 
 			stream.pushMessage(createNotification("Out of memory"));
 
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			inbox.dispose();
 		});
 
 		it("shows notifications after re-enabling", async () => {
 			config.set("coder.disableNotifications", true);
-			const { inbox, stream } = await createInbox();
+			const { stream } = await createInbox();
 
 			stream.pushMessage(createNotification("suppressed"));
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
@@ -121,7 +118,6 @@ describe("Inbox", () => {
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith(
 				"visible",
 			);
-			inbox.dispose();
 		});
 	});
 });

test/unit/workspace/workspaceMonitor.test.ts

@@ -18,6 +18,7 @@ import type {
 } from "coder/site/src/api/typesGenerated";
 
 import type { CoderApi } from "@/api/coderApi";
+import type { ContextManager } from "@/core/contextManager";
 
 function createMockClient(stream: MockEventStream<ServerSentEvent>) {
 	return {
@@ -56,7 +57,7 @@ describe("WorkspaceMonitor", () => {
 			ws,
 			client,
 			createMockLogger(),
-			contextManager as unknown as import("@/core/contextManager").ContextManager,
+			contextManager as unknown as ContextManager,
 		);
 		return { monitor, client, stream };
 	}
@@ -67,25 +68,24 @@ describe("WorkspaceMonitor", () => {
 			const changes: Workspace[] = [];
 			monitor.onChange.event((ws) => changes.push(ws));
 
-			const updated = createWorkspace({ outdated: true });
-			stream.pushMessage(workspaceEvent(updated));
+			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
 
 			expect(changes).toHaveLength(1);
 			expect(changes[0].outdated).toBe(true);
-			monitor.dispose();
 		});
 
 		it("logs parse errors without showing notifications", async () => {
-			const { monitor, stream } = await createMonitor();
+			const { stream } = await createMonitor();
+
 			stream.pushError(new Error("bad json"));
 
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			monitor.dispose();
 		});
 
 		it("closes the socket on dispose", async () => {
 			const stream = new MockEventStream<ServerSentEvent>();
 			const { monitor } = await createMonitor(createWorkspace(), stream);
+
 			monitor.dispose();
 
 			expect(stream.stream.close).toHaveBeenCalled();
@@ -94,35 +94,31 @@ describe("WorkspaceMonitor", () => {
 
 	describe("context and status bar", () => {
 		it("sets coder.workspace.updatable context when workspace is outdated", async () => {
-			const { monitor, stream } = await createMonitor();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
 
 			expect(contextManager.set).toHaveBeenCalledWith(
 				"coder.workspace.updatable",
 				true,
 			);
-			monitor.dispose();
 		});
 
 		it("shows status bar when outdated, hides when not", async () => {
-			const { monitor, stream } = await createMonitor();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
 			expect(statusBar.show).toHaveBeenCalled();
 
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: false })));
 			expect(statusBar.hide).toHaveBeenCalled();
-
-			monitor.dispose();
 		});
 	});
 
-	describe("notifications when enabled", () => {
+	describe("notifications", () => {
 		it("shows autostop notification when deadline is impending", async () => {
 			const deadline = new Date(Date.now() + 1000 * 60 * 15).toISOString();
-			const { monitor, stream } = await createMonitor();
-			monitor.markInitialSetupComplete();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(
 				workspaceEvent(
@@ -135,7 +131,6 @@ describe("WorkspaceMonitor", () => {
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith(
 				expect.stringContaining("scheduled to shut down"),
 			);
-			monitor.dispose();
 		});
 
 		it("shows deletion notification when deletion is impending", async () => {
@@ -152,7 +147,6 @@ describe("WorkspaceMonitor", () => {
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith(
 				expect.stringContaining("scheduled for deletion"),
 			);
-			monitor.dispose();
 		});
 
 		it("shows not-running notification after initial setup", async () => {
@@ -170,37 +164,27 @@ describe("WorkspaceMonitor", () => {
 				expect.anything(),
 				expect.anything(),
 			);
-			monitor.dispose();
 		});
 
-		it("does not show not-running notification before initial setup", async () => {
-			const { monitor, stream } = await createMonitor();
-
-			stream.pushMessage(
-				workspaceEvent(
-					createWorkspace({ latest_build: { status: "stopped" } }),
-				),
-			);
-
-			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			monitor.dispose();
-		});
-
-		it("does not show deletion notification before initial setup", async () => {
+		it("does not show deletion or not-running notifications before initial setup", async () => {
 			const deletingAt = new Date(
 				Date.now() + 1000 * 60 * 60 * 12,
 			).toISOString();
-			const { monitor, stream } = await createMonitor();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(
 				workspaceEvent(createWorkspace({ deleting_at: deletingAt })),
 			);
+			stream.pushMessage(
+				workspaceEvent(
+					createWorkspace({ latest_build: { status: "stopped" } }),
+				),
+			);
 
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			monitor.dispose();
 		});
 
-		it("shows outdated notification and fetches template details", async () => {
+		it("fetches template details for outdated notification", async () => {
 			const { monitor, stream, client } = await createMonitor();
 			monitor.markInitialSetupComplete();
 
@@ -214,13 +198,11 @@ describe("WorkspaceMonitor", () => {
 					"Update",
 				);
 			});
-			monitor.dispose();
 		});
 
 		it("only notifies once per event type", async () => {
 			const deadline = new Date(Date.now() + 1000 * 60 * 15).toISOString();
-			const { monitor, stream } = await createMonitor();
-			monitor.markInitialSetupComplete();
+			const { stream } = await createMonitor();
 
 			const ws = createWorkspace({
 				latest_build: { status: "running", deadline },
@@ -229,12 +211,11 @@ describe("WorkspaceMonitor", () => {
 			stream.pushMessage(workspaceEvent(ws));
 
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
-			monitor.dispose();
 		});
 	});
 
 	describe("disableUpdateNotifications", () => {
-		it("suppresses outdated notification but allows other notifications", async () => {
+		it("suppresses outdated notification but allows other types", async () => {
 			config.set("coder.disableUpdateNotifications", true);
 			const deadline = new Date(Date.now() + 1000 * 60 * 15).toISOString();
 			const { monitor, stream, client } = await createMonitor();
@@ -253,7 +234,6 @@ describe("WorkspaceMonitor", () => {
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith(
 				expect.stringContaining("scheduled to shut down"),
 			);
-			monitor.dispose();
 		});
 
 		it("shows outdated notification after re-enabling", async () => {
@@ -267,11 +247,9 @@ describe("WorkspaceMonitor", () => {
 			config.set("coder.disableUpdateNotifications", false);
 
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
-
 			await vi.waitFor(() => {
 				expect(client.getTemplate).toHaveBeenCalled();
 			});
-			monitor.dispose();
 		});
 	});
 
@@ -306,11 +284,10 @@ describe("WorkspaceMonitor", () => {
 			);
 
 			expect(vscode.window.showInformationMessage).not.toHaveBeenCalled();
-			monitor.dispose();
 		});
 
 		it("still updates context and status bar", async () => {
-			const { monitor, stream } = await createMonitor();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
 
@@ -319,7 +296,6 @@ describe("WorkspaceMonitor", () => {
 				true,
 			);
 			expect(statusBar.show).toHaveBeenCalled();
-			monitor.dispose();
 		});
 
 		it("still fires onChange events", async () => {
@@ -330,13 +306,11 @@ describe("WorkspaceMonitor", () => {
 			stream.pushMessage(workspaceEvent(createWorkspace({ outdated: true })));
 
 			expect(changes).toHaveLength(1);
-			monitor.dispose();
 		});
 
 		it("shows notifications after re-enabling", async () => {
 			const deadline = new Date(Date.now() + 1000 * 60 * 15).toISOString();
-			const { monitor, stream } = await createMonitor();
-			monitor.markInitialSetupComplete();
+			const { stream } = await createMonitor();
 
 			stream.pushMessage(
 				workspaceEvent(
@@ -357,7 +331,6 @@ describe("WorkspaceMonitor", () => {
 				),
 			);
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledTimes(1);
-			monitor.dispose();
 		});
 	});
 });