Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"lucide-react": "^1.27.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"sonner": "^2.0.7",
"yjs": "^13.6.32"
},
"devDependencies": {
Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { BootScreen, Button, CorbitsMark, EmptyState } from "@corbits/react-ui";
import { QueryClientProvider } from "@tanstack/react-query";
import { CircleAlert } from "lucide-react";
import { useEffect, useMemo } from "react";
import { Toaster } from "sonner";

import { AuthScreen } from "./auth-screen";
import { BenchProvider } from "./bench-context";
Expand Down Expand Up @@ -121,7 +120,6 @@ function Shell({
)}
</AppShell>
</ShellChromeProvider>
<Toaster />
</ComposerInsertionProvider>
</ProviderHealthProvider>
</BenchProvider>
Expand Down
196 changes: 196 additions & 0 deletions apps/web/test/toast-single-system.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
// CL-6372: a failed workbench create used to fire two toasts — the house
// `<Toaster />` from `@corbits/react-ui` (mounted in main.tsx) and a second,
// unstyled `<Toaster />` imported straight from `sonner` (mounted in
// app.tsx). Sonner's `toast()` renders into every mounted `<Toaster />`, so
// one `toast()` call rendered twice: the tokened grey box bottom-center from
// react-ui, and a default white pill bottom-right from the raw sonner
// mount. app.tsx no longer imports `sonner` at all — this file pins that a
// single `<Toaster />` mount produces exactly one toast per call, carries
// the house styling, and clears itself.

import { toast, Toaster } from "@corbits/react-ui";
import { afterEach, describe, expect, test } from "bun:test";
import { act } from "react";
import { createRoot, type Root } from "react-dom/client";

import { BenchProvider } from "../src/bench-context";
import { NavigationProvider } from "../src/navigation";
import { NewWorkbenchPickerRoute } from "../src/pages/new-workbench-picker";
import { TestQueryProvider } from "./test-query-provider";

const realFetch = globalThis.fetch;

afterEach(() => {
globalThis.fetch = realFetch;
});

function json(body: unknown, status = 200): Response {
return new Response(JSON.stringify(body), {
status,
headers: { "content-type": "application/json" },
});
}

const MEMBERSHIP = {
data: [
{
principalId: "prn_1",
tenantId: "tnt_1",
tenantName: "Corbits Bench",
tenantSlug: "corbits-bench",
kind: "user",
status: "active",
roles: [],
},
],
nextCursor: null,
};

function stubFailingCreate(): void {
globalThis.fetch = ((input: RequestInfo | URL) => {
const path = typeof input === "string" ? input : String(input);
if (path.includes("/api/me/principals")) {
return Promise.resolve(json(MEMBERSHIP));
}
if (path.includes("/workflows/definitions")) {
return Promise.resolve(json({ data: [], nextCursor: null }));
}
return Promise.resolve(json({ error: "boom" }, 500));
}) as typeof fetch;
}

let container: HTMLDivElement | null = null;
let root: Root | null = null;

afterEach(() => {
if (root !== null) {
act(() => root?.unmount());
root = null;
}
if (container !== null) {
container.remove();
container = null;
}
document
.querySelectorAll("[data-sonner-toaster]")
.forEach((node) => node.remove());
});

const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
const settle = () => act(() => sleep(10));

function visibleToasts(): NodeListOf<Element> {
return document.body.querySelectorAll("[data-sonner-toast]");
}

// Sonner keeps its toast store globally, independent of any one `<Toaster
// />` mount — an un-dismissed toast from one test reappears the moment the
// next test's fresh Toaster subscribes. Every test that leaves a toast
// showing waits out the full display duration before finishing.
async function waitForClear(): Promise<void> {
await act(async () => {
await sleep(2400);
});
}

async function renderPickerWithToaster(): Promise<void> {
container = document.createElement("div");
document.body.appendChild(container);
root = createRoot(container);
await act(async () => {
root?.render(
<TestQueryProvider>
<NavigationProvider navigate={() => undefined}>
<BenchProvider>
<NewWorkbenchPickerRoute />
</BenchProvider>
</NavigationProvider>
<Toaster />
</TestQueryProvider>,
);
});
for (let i = 0; i < 20; i++) {
await settle();
if (container.querySelector('[role="radiogroup"]') !== null) break;
}
}

describe("the one toast system (CL-6372)", () => {
test("a failed workbench create fires exactly one toast", async () => {
stubFailingCreate();
await renderPickerWithToaster();

const createButton = Array.from(
container?.querySelectorAll("button") ?? [],
).find((button) => button.textContent === "Create workbench");
await act(async () => {
createButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
});
for (let i = 0; i < 30; i++) {
await settle();
if (visibleToasts().length > 0) break;
}

const shown = visibleToasts();
expect(shown.length).toBe(1);
expect(shown[0]?.textContent).toBe(
"Couldn't create the workbench — try again.",
);
await waitForClear();
});

test("the failure toast carries the house styling, not sonner's default", async () => {
stubFailingCreate();
await renderPickerWithToaster();

const createButton = Array.from(
container?.querySelectorAll("button") ?? [],
).find((button) => button.textContent === "Create workbench");
await act(async () => {
createButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
});
for (let i = 0; i < 30; i++) {
await settle();
if (visibleToasts().length > 0) break;
}

const shown = visibleToasts()[0];
expect(shown?.classList.contains("corbits-toast")).toBe(true);
expect(shown?.getAttribute("data-styled")).toBe("false");
const region = document.body.querySelector("[data-sonner-toaster]");
expect(region?.getAttribute("data-y-position")).toBe("bottom");
expect(region?.getAttribute("data-x-position")).toBe("center");
await waitForClear();
});

test("a second toast dismisses the first instead of stacking", async () => {
stubFailingCreate();
await renderPickerWithToaster();

act(() => toast("First"));
await settle();
act(() => toast("Second"));
await settle();

const staying = document.body.querySelectorAll(
'[data-sonner-toast][data-removed="false"]',
);
expect(staying.length).toBe(1);
expect(staying[0]?.textContent).toBe("Second");
await waitForClear();
});

test("the toast dismisses itself after its display duration", async () => {
stubFailingCreate();
await renderPickerWithToaster();

act(() => toast("Grant revoked"));
await settle();
expect(visibleToasts().length).toBe(1);

await act(async () => {
await sleep(2400);
});
expect(visibleToasts().length).toBe(0);
});
});
3 changes: 2 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading