From 2ad113e3834acffdbb1c44bfa470a019b4c44a04 Mon Sep 17 00:00:00 2001 From: Gabriel Wu <13583761+lucifer1004@users.noreply.github.com> Date: Mon, 20 Jul 2026 20:32:03 -0700 Subject: [PATCH] test(web): clean up rendered trees globally --- web/src/components/AuthForm.test.tsx | 5 ++--- web/src/components/ProviderBrandMark.test.tsx | 6 ++---- web/src/components/ui.test.tsx | 6 ++---- web/src/pages/ProfilePage.test.tsx | 2 -- web/src/pages/ProjectsPage.test.tsx | 3 +-- web/src/pages/projects/PptxImportDialog.test.tsx | 6 ++---- web/src/pages/workspace/components/RevisionsPanel.test.tsx | 5 +---- web/vitest.config.ts | 1 + web/vitest.setup.ts | 4 ++++ 9 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 web/vitest.setup.ts diff --git a/web/src/components/AuthForm.test.tsx b/web/src/components/AuthForm.test.tsx index 08ff55f..7ae72a1 100644 --- a/web/src/components/AuthForm.test.tsx +++ b/web/src/components/AuthForm.test.tsx @@ -1,8 +1,8 @@ // @vitest-environment jsdom -import { cleanup, fireEvent, render, screen, within } from "@testing-library/react"; +import { fireEvent, render, screen, within } from "@testing-library/react"; import type { ButtonHTMLAttributes, InputHTMLAttributes, ReactNode } from "react"; -import { afterEach, describe, expect, it, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import { AuthForm } from "@/components/AuthForm"; import type { AuthConfig } from "@/lib/api"; import { translate } from "@/lib/i18n"; @@ -85,7 +85,6 @@ const providers: AuthConfig["identity_providers"] = [ } ]; -afterEach(cleanup); const t = (key: string, values?: Record) => translate("en", key, values); diff --git a/web/src/components/ProviderBrandMark.test.tsx b/web/src/components/ProviderBrandMark.test.tsx index fb86da4..506ed35 100644 --- a/web/src/components/ProviderBrandMark.test.tsx +++ b/web/src/components/ProviderBrandMark.test.tsx @@ -1,14 +1,12 @@ // @vitest-environment jsdom -import { cleanup, render } from "@testing-library/react"; -import { afterEach, describe, expect, it } from "vitest"; +import { render } from "@testing-library/react"; +import { describe, expect, it } from "vitest"; import { ProviderBrandMark, type ProviderBrand } from "@/components/ProviderBrandMark"; -afterEach(cleanup); - describe("ProviderBrandMark", () => { it("maps each repository brand to its explicit official asset", () => { const brands: ProviderBrand[] = [ diff --git a/web/src/components/ui.test.tsx b/web/src/components/ui.test.tsx index ac850b1..61b804b 100644 --- a/web/src/components/ui.test.tsx +++ b/web/src/components/ui.test.tsx @@ -1,11 +1,9 @@ // @vitest-environment jsdom -import { cleanup, render } from "@testing-library/react"; -import { afterEach, describe, expect, it } from "vitest"; +import { render } from "@testing-library/react"; +import { describe, expect, it } from "vitest"; import { UiButton } from "@/components/ui"; -afterEach(cleanup); - describe("UiButton", () => { it("serializes boolean ARIA state for the custom-element host", () => { const { container, rerender } = render(); diff --git a/web/src/pages/ProfilePage.test.tsx b/web/src/pages/ProfilePage.test.tsx index 88731b0..b0e75cb 100644 --- a/web/src/pages/ProfilePage.test.tsx +++ b/web/src/pages/ProfilePage.test.tsx @@ -2,7 +2,6 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { - cleanup, fireEvent, render, screen, @@ -146,7 +145,6 @@ function renderProfile() { } afterEach(() => { - cleanup(); vi.clearAllMocks(); }); diff --git a/web/src/pages/ProjectsPage.test.tsx b/web/src/pages/ProjectsPage.test.tsx index 6c6136f..669323f 100644 --- a/web/src/pages/ProjectsPage.test.tsx +++ b/web/src/pages/ProjectsPage.test.tsx @@ -1,6 +1,6 @@ // @vitest-environment jsdom -import { cleanup, fireEvent, render, screen } from "@testing-library/react"; +import { fireEvent, render, screen } from "@testing-library/react"; import type { ButtonHTMLAttributes, InputHTMLAttributes, @@ -145,7 +145,6 @@ function renderPage(projects: Project[] = []) { } afterEach(() => { - cleanup(); vi.clearAllMocks(); }); diff --git a/web/src/pages/projects/PptxImportDialog.test.tsx b/web/src/pages/projects/PptxImportDialog.test.tsx index 1808036..9cd8c44 100644 --- a/web/src/pages/projects/PptxImportDialog.test.tsx +++ b/web/src/pages/projects/PptxImportDialog.test.tsx @@ -1,6 +1,6 @@ // @vitest-environment jsdom -import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react"; +import { fireEvent, render, screen, waitFor } from "@testing-library/react"; import type { ButtonHTMLAttributes, ComponentProps, @@ -8,7 +8,7 @@ import type { ReactNode, SelectHTMLAttributes } from "react"; -import { afterEach, describe, expect, it, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import type { ProcessingInputProfileSelector } from "@/lib/api"; import type { Translator } from "@/lib/i18n"; import { PptxImportDialog } from "@/pages/projects/PptxImportDialog"; @@ -74,8 +74,6 @@ const selector: ProcessingInputProfileSelector = { ] }; -afterEach(() => cleanup()); - function renderDialog( overrides: Partial> = {} ) { diff --git a/web/src/pages/workspace/components/RevisionsPanel.test.tsx b/web/src/pages/workspace/components/RevisionsPanel.test.tsx index 7dd0b2b..2506250 100644 --- a/web/src/pages/workspace/components/RevisionsPanel.test.tsx +++ b/web/src/pages/workspace/components/RevisionsPanel.test.tsx @@ -1,7 +1,6 @@ // @vitest-environment jsdom import { - cleanup, fireEvent, render, screen, @@ -13,7 +12,7 @@ import type { InputHTMLAttributes, ReactNode } from "react"; -import { afterEach, describe, expect, it, vi } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import type { Translator } from "@/lib/i18n"; import { RevisionsPanel } from "@/pages/workspace/components/RevisionsPanel"; @@ -73,8 +72,6 @@ vi.mock("@/components/HistoryPanel", () => ({ const t: Translator = (key) => key; -afterEach(() => cleanup()); - function renderPanel( overrides: Partial> = {} ) { diff --git a/web/vitest.config.ts b/web/vitest.config.ts index 88c5dc1..27d5059 100644 --- a/web/vitest.config.ts +++ b/web/vitest.config.ts @@ -27,6 +27,7 @@ export default defineConfig({ }, test: { execArgv: ["--no-experimental-webstorage"], + setupFiles: ["./vitest.setup.ts"], include: ["src/**/*.test.ts", "src/**/*.test.tsx"], exclude: ["tests/e2e/**", "node_modules/**"] } diff --git a/web/vitest.setup.ts b/web/vitest.setup.ts new file mode 100644 index 0000000..b37ae6c --- /dev/null +++ b/web/vitest.setup.ts @@ -0,0 +1,4 @@ +import { cleanup } from "@testing-library/react"; +import { afterEach } from "vitest"; + +afterEach(cleanup);