Skip to content

Commit f17df35

Browse files
test(web): fix theme reset order and render ownership in slice 1
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 857a3cf commit f17df35

4 files changed

Lines changed: 35 additions & 25 deletions

File tree

‎apps/web/src/browser/HostedBrowserWebview.browser.test.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,15 @@ function setup() {
9696
// The webview releases its desktop tab on a timer after unmount; run it before the test ends
9797
// so it cannot land in the next one.
9898
async function renderHost(ui: ReactNode) {
99-
const screen = await render(ui);
100-
const disposeScreen = screen[Symbol.asyncDispose];
101-
return Object.assign(screen, {
102-
async [Symbol.asyncDispose]() {
103-
try {
104-
using _timers = fakeTimers();
105-
await screen.unmount();
106-
await vi.advanceTimersByTimeAsync(0);
107-
} finally {
108-
await disposeScreen();
109-
}
110-
},
99+
await using stack = new AsyncDisposableStack();
100+
const screen = stack.use(await render(ui));
101+
stack.defer(async () => {
102+
using _timers = fakeTimers();
103+
await screen.unmount();
104+
await vi.advanceTimersByTimeAsync(0);
111105
});
106+
const environment = stack.move();
107+
return Object.assign(screen, { [Symbol.asyncDispose]: () => environment.disposeAsync() });
112108
}
113109

114110
describe("HostedBrowserWebview settings hydration", () => {
@@ -239,12 +235,15 @@ describe("HostedBrowserWebview viewport layout", () => {
239235
browserDefaultZoomFactor: 1.5,
240236
});
241237
await act(() => ensureClientSettingsHydrated());
242-
const screen = await renderHost(webview(viewport));
238+
await using stack = new AsyncDisposableStack();
239+
const screen = stack.use(await renderHost(webview(viewport)));
243240
const guest = screen.container.querySelector("webview");
244241
expect(guest).not.toBeNull();
242+
const environment = stack.move();
245243
return Object.assign(screen, {
246244
guest: guest!,
247245
setViewport: (next: PreviewViewportSetting) => screen.rerender(webview(next)),
246+
[Symbol.asyncDispose]: () => environment.disposeAsync(),
248247
});
249248
}
250249

@@ -303,7 +302,8 @@ describe("HostedBrowserWebview viewport layout", () => {
303302
const { guest } = screen;
304303
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1200, height: 900 });
305304

306-
using _noBridge = stubGlobal("desktopBridge", undefined);
305+
// `_bridge` puts the original back after the unmount, so the unmount still sees no bridge.
306+
Reflect.set(globalThis, "desktopBridge", undefined);
307307
await act(() => window.dispatchEvent(new Event("resize")));
308308
expect(guest.getBoundingClientRect()).toMatchObject({ width: 1200, height: 900 });
309309
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,14 @@ describe("ChatMarkdown theme drafts", () => {
127127
return <ChatMarkdown cwd={undefined} text={"```typescript\nconst answer = 42;\n```"} />;
128128
}
129129
await getSyntaxHighlighterPromise("typescript");
130+
await using screen = await render(<Preview />);
131+
// Disposed before the unmount, while useTheme still listens for the storage event.
130132
using _storage = {
131133
[Symbol.dispose]() {
132134
localStorage.clear();
133135
window.dispatchEvent(new StorageEvent("storage", { key: null }));
134136
},
135137
};
136-
await using screen = await render(<Preview />);
137138
const { container } = screen;
138139
await act(async () => {
139140
selection.setTheme(savedAppearance);

‎apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,12 @@ function editorIn(container: HTMLElement) {
7878
}
7979

8080
async function mountEditor(...props: Parameters<typeof composer>) {
81-
const screen = await render(composer(...props));
82-
let editor: Editor;
83-
try {
84-
editor = editorIn(screen.container);
85-
} catch (error) {
86-
await screen[Symbol.asyncDispose]();
87-
throw error;
88-
}
81+
await using stack = new AsyncDisposableStack();
82+
const screen = stack.use(await render(composer(...props)));
83+
const editor = editorIn(screen.container);
84+
const environment = stack.move();
8985
return Object.assign(screen, {
86+
[Symbol.asyncDispose]: () => environment.disposeAsync(),
9087
editor,
9188
/** Rerenders the same composer with new props, as a parent would. */
9289
update: async (...next: Parameters<typeof composer>) => {
@@ -447,9 +444,12 @@ describe("composer context undo lifetime", () => {
447444
return createElement(ComposerPromptEditor, editorProps);
448445
}
449446

450-
const screen = await render(createElement(Composer, { targetKey: "a" }));
447+
await using stack = new AsyncDisposableStack();
448+
const screen = stack.use(await render(createElement(Composer, { targetKey: "a" })));
451449
const editor = () => editorIn(screen.container);
450+
const environment = stack.move();
452451
return Object.assign(screen, {
452+
[Symbol.asyncDispose]: () => environment.disposeAsync(),
453453
initialValue,
454454
show: (targetKey: string) => screen.rerender(createElement(Composer, { targetKey })),
455455
editor,

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,11 @@ function tabs(
139139
);
140140
}
141141

142-
async function renderTabs(...args: Parameters<typeof tabs>) {
142+
function setup() {
143143
setAudioMuted.mockClear();
144+
}
145+
146+
function renderTabs(...args: Parameters<typeof tabs>) {
144147
return render(tabs(...args));
145148
}
146149

@@ -151,6 +154,7 @@ const button = (container: HTMLElement, name: string) =>
151154

152155
describe("preview tab favicon", () => {
153156
it("prefers a live capture and never asks a public provider about a private hostname", async () => {
157+
setup();
154158
await using screen = await renderTabs(favicon(PIXEL_A, "http://24x.xf.local/"));
155159
expect(imageSources(screen.container)).toEqual([PIXEL_A]);
156160

@@ -159,6 +163,7 @@ describe("preview tab favicon", () => {
159163
});
160164

161165
it("keeps route-specific captures isolated between live tabs on one origin", async () => {
166+
setup();
162167
await using screen = await renderTabs(
163168
favicon(PIXEL_A, "http://24x.xf.local/"),
164169
favicon(PIXEL_B, "http://24x.xf.local/admin"),
@@ -167,6 +172,7 @@ describe("preview tab favicon", () => {
167172
});
168173

169174
it("hides a capture while the server session still describes another origin", async () => {
175+
setup();
170176
await using screen = await renderTabs(favicon(PIXEL_A, "https://example.com/"));
171177
expect(imageSources(screen.container)).not.toContain(PIXEL_A);
172178
});
@@ -177,6 +183,7 @@ describe("preview tab audio toggle", () => {
177183
{ audible: false, audioMuted: false },
178184
{ audible: false, audioMuted: true },
179185
])("is absent for a silent tab (muted=$audioMuted)", async (audio) => {
186+
setup();
180187
await using screen = await renderTabs(null, undefined, audio);
181188
expect(button(screen.container, "Mute Local site")).toBeUndefined();
182189
expect(button(screen.container, "Unmute Local site")).toBeUndefined();
@@ -186,12 +193,14 @@ describe("preview tab audio toggle", () => {
186193
{ audioMuted: false, label: "Mute Local site", nextMuted: true },
187194
{ audioMuted: true, label: "Unmute Local site", nextMuted: false },
188195
])("$label addresses the desktop by runtime tab id", async ({ audioMuted, label, nextMuted }) => {
196+
setup();
189197
await using screen = await renderTabs(null, undefined, { audible: true, audioMuted });
190198
await act(() => button(screen.container, label)!.click());
191199
expect(setAudioMuted).toHaveBeenCalledExactlyOnceWith("runtime:tab-1", nextMuted);
192200
});
193201

194202
it("hides the toggle when no runtime tab id can be resolved", async () => {
203+
setup();
195204
await using screen = await renderTabs(null, undefined, { audible: true }, null);
196205
expect(button(screen.container, "Mute Local site")).toBeUndefined();
197206
});

0 commit comments

Comments
 (0)