Skip to content

Commit 5f3284e

Browse files
test(web): ban frame and transition waits in browser tests
Add t3code/no-frame-waits-in-browser-tests for apps/web browser tests. It rejects requestAnimationFrame waits, real timers inside Promise executors, transitionend/animationend listeners, direct vi.useFakeTimers, and partial toFake sets. Existing tests now assert through expect.element/vi.waitFor, step mocked frames, or advance the full fakeTimers() clock. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9e4135c commit 5f3284e

20 files changed

Lines changed: 413 additions & 146 deletions

‎apps/web/src/components/ChatMarkdown.browser.test.tsx‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,6 @@ describe("ChatMarkdown thread find", () => {
11811181
</div>
11821182
);
11831183
}
1184-
const frame = () =>
1185-
act(() => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())));
11861184
// Highlights live in a document-wide registry the rendered tree does not own.
11871185
const clearHighlights = () => ({ [Symbol.dispose]: () => CSS.highlights.clear() });
11881186
const activeHighlights = () =>
@@ -1219,17 +1217,14 @@ describe("ChatMarkdown thread find", () => {
12191217

12201218
expect(container.textContent).not.toContain("nothing here");
12211219
await show("needle", 0);
1222-
await frame();
1220+
await vi.waitFor(() => expect(activeHighlights()).toEqual(["needle"]));
12231221
expect(openStates()).toEqual(["false", "false", "false"]);
12241222
expect(container.textContent).toContain("nothing here");
1225-
expect(activeHighlights()).toEqual(["needle"]);
12261223
expect(CSS.highlights.get("t3-thread-find")?.size ?? 0).toBe(0);
12271224

12281225
await show("needle", 1);
1229-
await frame();
1230-
await frame();
1231-
expect(openStates()).toEqual(["false", "true", "true"]);
1232-
expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1);
1226+
await vi.waitFor(() => expect(openStates()).toEqual(["false", "true", "true"]));
1227+
await vi.waitFor(() => expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1));
12331228
});
12341229

12351230
it("keeps Mermaid diagrams rendered until find selects a match in their source", async () => {
@@ -1245,12 +1240,9 @@ describe("ChatMarkdown thread find", () => {
12451240
const diagrams = () => container.querySelectorAll('svg[aria-label="Diagram"]').length;
12461241

12471242
await using screen = await render(probe("Needle"), { container });
1248-
await frame();
1249-
expect(diagrams()).toBe(2);
1243+
await vi.waitFor(() => expect(diagrams()).toBe(2));
12501244
await screen.rerender(probe("Alpha"));
1251-
await frame();
1252-
await frame();
1253-
expect(diagrams()).toBe(1);
1245+
await vi.waitFor(() => expect(diagrams()).toBe(1));
12541246
await vi.waitFor(() => expect(activeHighlights()).toEqual(["Alpha"]));
12551247
});
12561248

@@ -1305,7 +1297,6 @@ describe("ChatMarkdown thread find", () => {
13051297
</FindProbe>,
13061298
{ container },
13071299
);
1308-
await frame();
13091300
// Lazy blocks such as Mermaid can swap their source text after the first frame,
13101301
// emptying a range for a moment, so wait for the highlights to settle.
13111302
await vi.waitFor(() => {

‎apps/web/src/components/DiffPanel.browser.test.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ async function scrollToStart(container: HTMLElement) {
164164
await act(async () => {
165165
viewport(container).scrollTop = 0;
166166
viewport(container).dispatchEvent(new Event("scroll"));
167-
await new Promise(requestAnimationFrame);
168167
});
169168
}
170169
async function selectTreeFile(container: HTMLElement, path: string) {

‎apps/web/src/components/ThreadStatusIndicators.subscriptions.browser.test.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ it("leases only visible palette results while retaining observed and cached PR b
114114
const scrollTo = async (top: number) => {
115115
await act(async () => {
116116
viewport().scrollTop = top;
117-
await new Promise((resolve) => requestAnimationFrame(() => setTimeout(resolve, 50)));
118117
});
119118
};
120119
const badgeCount = () =>
@@ -158,15 +157,19 @@ it("leases only visible palette results while retaining observed and cached PR b
158157

159158
// Band [1000, 1340]: rows 0..7.
160159
await scrollTo(SPACER + 160);
161-
expect(state.queries).toHaveLength(8);
160+
await vi.waitFor(() => {
161+
expect(state.queries).toHaveLength(8);
162+
expect(badgeCount()).toBe(9);
163+
});
162164
expect(state.queries.filter((key) => key.startsWith("vcs:"))).toHaveLength(4);
163165
expect(state.queries.filter((key) => key.startsWith("pr:"))).toHaveLength(4);
164-
expect(badgeCount()).toBe(9);
165166

166167
// Band [1370, 1710]: rows 8..15.
167168
await scrollTo(SPACER + 8 * ROW_HEIGHT + 10 + 160);
168-
expect(state.queries).toHaveLength(16);
169-
expect(badgeCount()).toBe(17);
169+
await vi.waitFor(() => {
170+
expect(state.queries).toHaveLength(16);
171+
expect(badgeCount()).toBe(17);
172+
});
170173
});
171174

172175
it("keeps a long PR hover list in the viewport and lets the last row be selected", async () => {

‎apps/web/src/components/chat/ChangedFilesTree.browser.test.tsx‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ function buttonWithText(container: HTMLElement, label: string) {
2323
return button!;
2424
}
2525

26-
async function scrollTo(element: HTMLElement, top: number) {
26+
async function scrollTo(element: HTMLElement, top: number, revealedText?: string) {
2727
await act(async () => {
2828
element.scrollTop = top;
2929
element.dispatchEvent(new Event("scroll"));
30-
await new Promise(requestAnimationFrame);
3130
});
31+
if (revealedText !== undefined) {
32+
await vi.waitFor(() => expect(text(element)).toContain(revealedText));
33+
}
3234
}
3335

3436
describe("ChangedFilesCard", () => {
@@ -145,8 +147,7 @@ describe("ChangedFilesTree", () => {
145147
expect(text(container)).not.toContain("folder-0999");
146148

147149
const viewport = container.firstElementChild as HTMLElement;
148-
await scrollTo(viewport, viewport.scrollHeight);
149-
expect(text(container)).toContain("folder-0999");
150+
await scrollTo(viewport, viewport.scrollHeight, "folder-0999");
150151
expect(container.querySelectorAll("button").length).toBeLessThan(60);
151152
await act(async () => buttonWithText(container, "folder-0999").click());
152153
expect(text(container)).toContain("index.ts");
@@ -188,13 +189,11 @@ describe("ChangedFilesTree", () => {
188189
expect(text(container)).toContain("file-00000.ts");
189190
expect(text(container)).not.toContain("file-08000.ts");
190191

191-
await scrollTo(viewport, 420 + 8_001 * 28);
192-
expect(text(container)).toContain("file-08000.ts");
192+
await scrollTo(viewport, 420 + 8_001 * 28, "file-08000.ts");
193193
expect(text(container)).not.toContain("file-00000.ts");
194194
expect(container.querySelectorAll("button").length).toBeLessThan(60);
195195

196-
await scrollTo(viewport, viewport.scrollHeight);
197-
expect(text(container)).toContain("file-16184.ts");
196+
await scrollTo(viewport, viewport.scrollHeight, "file-16184.ts");
198197
await act(async () => buttonWithText(container, "file-16184.ts").click());
199198
expect(onOpenTurnDiff).toHaveBeenCalledWith(RunId.make("run-1"), "src/file-16184.ts");
200199
await act(async () =>
@@ -235,17 +234,15 @@ describe("ChangedFilesTree", () => {
235234
);
236235
const { container } = screen;
237236
const viewport = container.firstElementChild as HTMLElement;
238-
await scrollTo(viewport, 420);
237+
await scrollTo(viewport, 420, "src");
239238
await act(async () => buttonWithText(container, "src").click());
240239
expect(container.querySelectorAll("button").length).toBeLessThan(60);
241240

242-
await scrollTo(viewport, 420 + 8_001 * 28);
243-
expect(text(container)).toContain("file-08000.ts");
241+
await scrollTo(viewport, 420 + 8_001 * 28, "file-08000.ts");
244242
expect(container.querySelectorAll("button").length).toBeLessThan(60);
245243

246-
await scrollTo(viewport, viewport.scrollHeight);
247-
expect(text(container)).toContain("file-16184.ts");
248-
await scrollTo(viewport, 420);
244+
await scrollTo(viewport, viewport.scrollHeight, "file-16184.ts");
245+
await scrollTo(viewport, 420, "src");
249246
await act(async () => buttonWithText(container, "src").click());
250247
expect(text(container)).not.toContain("file-00000.ts");
251248
expect(container.querySelectorAll("button").length).toBe(1);
@@ -267,8 +264,7 @@ describe("ChangedFilesTree", () => {
267264
const viewport = container.firstElementChild as HTMLElement;
268265
const focusedFile = buttonWithText(container, "file-00000.ts");
269266
await act(async () => focusedFile.focus());
270-
await scrollTo(viewport, 8_001 * 28);
271-
expect(text(container)).toContain("file-08000.ts");
267+
await scrollTo(viewport, 8_001 * 28, "file-08000.ts");
272268
expect(document.activeElement).toBe(focusedFile);
273269
expect(container.querySelectorAll("button").length).toBeLessThan(60);
274270

@@ -294,7 +290,7 @@ describe("ChangedFilesTree", () => {
294290
await using screen = await render(content(140, 0));
295291
const { container } = screen;
296292
const viewport = container.firstElementChild as HTMLElement;
297-
await scrollTo(viewport, 8_001 * 28);
293+
await scrollTo(viewport, 8_001 * 28, "file-08000.ts");
298294
const beforeResize = container.querySelectorAll("button").length;
299295
await screen.rerender(content(560, 560));
300296
await expect

‎apps/web/src/components/chat/ComposerBannerStack.browser.test.tsx‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "../../index.css";
22

3-
import { expect, it } from "vite-plus/test";
3+
import { expect, it, vi } from "vite-plus/test";
44
import { page, userEvent } from "vite-plus/test/browser";
55

66
import { act, render } from "../../../test/render";
@@ -12,9 +12,6 @@ function sized(width: number) {
1212
return container;
1313
}
1414

15-
const nextFrame = () =>
16-
act(() => new Promise<void>((resolve) => requestAnimationFrame(() => setTimeout(resolve, 0))));
17-
1815
const usage = (description: string) => (
1916
<ComposerBannerStack
2017
items={[{ id: "usage", variant: "info", icon: null, title: "Usage limits", description }]}
@@ -25,25 +22,20 @@ it("only offers notice details when the description cannot fit", async () => {
2522
await using screen = await render(usage("OpenCode"), { container: sized(700) });
2623
const { container } = screen;
2724
const hasDetails = () => container.querySelector('[aria-label="Show notice details"]') !== null;
28-
await nextFrame();
29-
expect(hasDetails()).toBe(false);
25+
await vi.waitFor(() => expect(hasDetails()).toBe(false));
3026

3127
await screen.rerender(usage("OpenCode ".repeat(40)));
32-
await nextFrame();
33-
expect(hasDetails()).toBe(true);
28+
await vi.waitFor(() => expect(hasDetails()).toBe(true));
3429

3530
container.style.width = "4000px";
36-
await nextFrame();
37-
expect(hasDetails()).toBe(false);
31+
await vi.waitFor(() => expect(hasDetails()).toBe(false));
3832

3933
await screen.rerender(usage("OpenCode"));
40-
await nextFrame();
41-
expect(hasDetails()).toBe(false);
34+
await vi.waitFor(() => expect(hasDetails()).toBe(false));
4235

4336
// A narrow composer hides the description entirely, so details are the only way to read it.
4437
container.style.width = "300px";
45-
await nextFrame();
46-
expect(hasDetails()).toBe(true);
38+
await vi.waitFor(() => expect(hasDetails()).toBe(true));
4739
});
4840

4941
it("keeps only the usage limit attached while an active goal waits in the collapsible stack", async () => {

‎apps/web/src/components/chat/MessagesTimeline.browser.test.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,6 +1599,9 @@ describe("MessagesTimeline scroll position", () => {
15991599
await userEvent.wheel(viewport, { delta: { y: -2000 } });
16001600
await click(toggle());
16011601
await click(toggle());
1602+
// The restore decision runs in the timeline's second disclosure-settle frame and leaves no
1603+
// DOM trace when it declines, so this negative check has to outlast those two frames.
1604+
// oxlint-disable-next-line t3code/no-frame-waits-in-browser-tests -- negative check needs the settle frames to have run
16021605
await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
16031606
expect(composerState()).toBe("collapsed");
16041607
});
@@ -1623,14 +1626,14 @@ describe("MessagesTimeline send anchor", () => {
16231626

16241627
it("does not anchor a follow-up user message that is not the newest turn", async () => {
16251628
const onAnchorReady = vi.fn();
1626-
await using _screen = await renderTimeline(
1629+
await using screen = await renderTimeline(
16271630
[message("First prompt."), message("Newest prompt.", {}, "message-2")],
16281631
{
16291632
anchorMessageId: MessageId.make("message-2"),
16301633
onAnchorReady,
16311634
},
16321635
);
1633-
await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
1636+
await vi.waitFor(() => expect(screen.container.textContent).toContain("Newest prompt."));
16341637
expect(onAnchorReady).not.toHaveBeenCalled();
16351638
});
16361639
});

‎apps/web/src/components/chat/ThreadDetailsPrRows.browser.test.tsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,21 @@ it("lets only watched pull requests stop their watch", async () => {
240240
});
241241
});
242242

243+
function nextResize(element: Element): Promise<void> {
244+
return new Promise((resolve) => {
245+
let initialHeight: number | undefined;
246+
const observer = new ResizeObserver(([entry]) => {
247+
const height = entry!.contentRect.height;
248+
if (initialHeight === undefined) initialHeight = height;
249+
else if (height !== initialHeight) {
250+
observer.disconnect();
251+
resolve();
252+
}
253+
});
254+
observer.observe(element);
255+
});
256+
}
257+
243258
it("keeps workspace controls after expanding and collapsing 70 linked pull requests", async () => {
244259
await using test = await setup();
245260
const { screen, container } = test;
@@ -284,15 +299,19 @@ it("keeps workspace controls after expanding and collapsing 70 linked pull reque
284299
await expect.element(runContext).toBeVisible();
285300
await expect.element(editor).toBeVisible();
286301

287-
await userEvent.click(page.getByRole("button", { name: "Show 69 more" }));
302+
const showMore = page.getByRole("button", { name: "Show 69 more" });
303+
const content = showMore
304+
.element()
305+
.closest('[data-slot="scroll-area-viewport"]')!.firstElementChild!;
306+
// The card measures this element through the shared ResizeObserver, created before this one,
307+
// so this observer seeing the expanded size means the card has measured it too.
308+
const expandedSizeDelivered = nextResize(content);
309+
await userEvent.click(showMore);
288310
await expect.element(page.getByRole("button", { name: "Show less" })).toBeInTheDocument();
289311
const extraRows = () =>
290312
container.querySelectorAll('[aria-label^="https://github.com/pingdotgg/t3code/pull/"]');
291313
expect(extraRows()).toHaveLength(69);
292-
// Let native ResizeObserver deliver the expanded content size before collapsing it.
293-
await act(async () => {
294-
await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
295-
});
314+
await act(() => expandedSizeDelivered);
296315
await userEvent.click(page.getByRole("button", { name: "Show less" }));
297316
await expect.element(page.getByRole("button", { name: "Show 69 more" })).toBeVisible();
298317
expect(extraRows()).toHaveLength(0);

‎apps/web/src/components/chat/WorkflowOpeningBlock.browser.test.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,14 @@ async function renderOpening(script: string, query = "") {
7979
<Find container={container} query={query} />
8080
</AppAtomRegistryProvider>
8181
);
82-
const nextFrame = () =>
83-
act(() => new Promise<void>((resolve) => requestAnimationFrame(() => resolve())));
8482
await using stack = new AsyncDisposableStack();
8583
stack.defer(() => CSS.highlights.clear());
8684
const screen = stack.use(await render(block(script, query), { container }));
87-
await nextFrame();
8885
const environment = stack.move();
8986
return {
9087
container,
9188
rerender: async (script: string, query: string) => {
9289
await screen.rerender(block(script, query));
93-
await nextFrame();
9490
},
9591
[Symbol.asyncDispose]: () => environment.disposeAsync(),
9692
};
@@ -115,7 +111,9 @@ it("shows a short script as highlighted code with nothing to open", async () =>
115111

116112
it("folds a long script until it is opened", async () => {
117113
await using screen = await renderOpening(LONG_SCRIPT);
118-
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("false");
114+
await vi.waitFor(() =>
115+
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("false"),
116+
);
119117
expect(screen.container.querySelector("[data-thread-find-fold]")).not.toBeNull();
120118
await act(() => foldToggle(screen.container)?.click());
121119
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("true");
@@ -124,10 +122,12 @@ it("folds a long script until it is opened", async () => {
124122

125123
it("finds the workflow's name and opens a folded script on a match below the fold", async () => {
126124
await using screen = await renderOpening(LONG_SCRIPT, "repo-check");
127-
expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1);
125+
await vi.waitFor(() => expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1));
128126
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("false");
129127

130128
await screen.rerender(LONG_SCRIPT, "TAILONLY");
131-
expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1);
132-
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("true");
129+
await vi.waitFor(() =>
130+
expect(foldToggle(screen.container)?.getAttribute("aria-expanded")).toBe("true"),
131+
);
132+
await vi.waitFor(() => expect(CSS.highlights.get("t3-thread-find-active")?.size).toBe(1));
133133
});

0 commit comments

Comments
 (0)