Skip to content

Commit 4213cba

Browse files
test(web): fix slice five review findings
1 parent 2d7960a commit 4213cba

7 files changed

Lines changed: 74 additions & 74 deletions

‎apps/web/src/components/diffs/StyledDiffCodeView.browser.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ describe("code-view worker lifecycle", () => {
164164
async function workerEnvironment() {
165165
await using stack = new AsyncDisposableStack();
166166
stack.use(fakeTimers({ toFake: ["setTimeout", "clearTimeout"] }));
167-
stack.defer(async () => {
168-
await vi.runOnlyPendingTimersAsync();
169-
});
170167
// Pins the pool at two workers whatever machine runs the suite.
171168
stack.use(vi.spyOn(navigator, "hardwareConcurrency", "get").mockReturnValue(2));
172169
const initialize = WorkerPoolManager.prototype.initialize;
@@ -180,6 +177,9 @@ describe("code-view worker lifecycle", () => {
180177
return pending;
181178
}),
182179
);
180+
stack.defer(async () => {
181+
await vi.runOnlyPendingTimersAsync();
182+
});
183183
return stack.move();
184184
}
185185

‎apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { act, render, stubGlobal } from "../../../test/render";
1+
import { act, render, stubGlobal, type Screen } from "../../../test/render";
22
import { EnvironmentId } from "@t3tools/contracts";
33
import { describe, expect, it, vi } from "vite-plus/test";
44

@@ -34,12 +34,14 @@ describe("attachment HTML preview recovery", () => {
3434
/>,
3535
);
3636

37-
const toggleMode = async (label: string) => {
38-
const button = document.querySelector<HTMLButtonElement>(`button[aria-label="${label}"]`);
37+
const toggleMode = async (screen: Screen, label: string) => {
38+
const button = screen.container.querySelector<HTMLButtonElement>(
39+
`button[aria-label="${label}"]`,
40+
);
3941
expect(button, label).not.toBeNull();
4042
await act(async () => button!.click());
4143
};
42-
const alert = () => document.querySelector('[role="alert"]');
44+
const alert = (screen: Screen) => screen.container.querySelector('[role="alert"]');
4345

4446
it("keeps a renewed URL for subsequent rendered and source views", async () => {
4547
setup();
@@ -49,21 +51,21 @@ describe("attachment HTML preview recovery", () => {
4951
"fetch",
5052
vi.fn(async () => new Response("<p>Captured HTML</p>")),
5153
);
52-
await using _screen = await openRemote();
53-
expect(document.querySelector("iframe")?.getAttribute("src")).toBe(originalUrl);
54+
await using screen = await openRemote();
55+
expect(screen.container.querySelector("iframe")?.getAttribute("src")).toBe(originalUrl);
5456
now = 61 * 60_000;
55-
await toggleMode("Show HTML source");
57+
await toggleMode(screen, "Show HTML source");
5658
await act(async () => {
5759
await import("./ReadOnlySourcePreview");
5860
});
5961
expect(fetch).toHaveBeenCalledExactlyOnceWith(renewedUrl, expect.any(Object));
6062
await vi.waitFor(() =>
61-
expect(document.querySelector("pre")?.textContent).toBe("<p>Captured HTML</p>"),
63+
expect(screen.container.querySelector("pre")?.textContent).toBe("<p>Captured HTML</p>"),
6264
);
6365

64-
await toggleMode("Show rendered page");
65-
expect(document.querySelector("iframe")?.getAttribute("src")).toBe(renewedUrl);
66-
await toggleMode("Show HTML source");
66+
await toggleMode(screen, "Show rendered page");
67+
expect(screen.container.querySelector("iframe")?.getAttribute("src")).toBe(renewedUrl);
68+
await toggleMode(screen, "Show HTML source");
6769
expect(refresh).toHaveBeenCalledTimes(2);
6870
expect(vi.mocked(fetch).mock.calls.map(([url]) => url)).toEqual([renewedUrl, renewedUrl]);
6971
});
@@ -76,15 +78,15 @@ describe("attachment HTML preview recovery", () => {
7678
"fetch",
7779
vi.fn(async () => new Response("<p>Captured HTML</p>")),
7880
);
79-
await using _screen = await openRemote();
81+
await using screen = await openRemote();
8082
now = 61 * 60_000;
8183
refresh.mockResolvedValue(null);
82-
await toggleMode("Show HTML source");
84+
await toggleMode(screen, "Show HTML source");
8385
expect(fetch).not.toHaveBeenCalled();
84-
expect(alert()?.textContent).toContain("Reconnect to the environment and try again.");
86+
expect(alert(screen)?.textContent).toContain("Reconnect to the environment and try again.");
8587

86-
await toggleMode("Show rendered page");
87-
await toggleMode("Show HTML source");
88+
await toggleMode(screen, "Show rendered page");
89+
await toggleMode(screen, "Show HTML source");
8890
expect(refresh).toHaveBeenCalledTimes(3);
8991
expect(fetch).not.toHaveBeenCalled();
9092
});
@@ -98,19 +100,19 @@ describe("attachment HTML preview recovery", () => {
98100
vi.fn(async () => new Response("<p>Captured HTML</p>")),
99101
);
100102
const file = new Blob([new Uint8Array([0x3c, 0x70, 0x3e, 0xe9])], { type: "text/html" });
101-
await using _screen = await render(
103+
await using screen = await render(
102104
<AttachmentFilePreview
103105
name="document.html"
104106
mimeType="text/html"
105107
sizeBytes={file.size}
106108
file={file}
107109
/>,
108110
);
109-
await toggleMode("Show HTML source");
110-
await vi.waitFor(() => expect(alert()?.textContent).toContain("not UTF-8"));
111+
await toggleMode(screen, "Show HTML source");
112+
await vi.waitFor(() => expect(alert(screen)?.textContent).toContain("not UTF-8"));
111113

112-
await toggleMode("Show rendered page");
113-
expect(alert()).toBeNull();
114-
expect(document.querySelector("iframe")?.title).toBe("document.html");
114+
await toggleMode(screen, "Show rendered page");
115+
expect(alert(screen)).toBeNull();
116+
expect(screen.container.querySelector("iframe")?.title).toBe("document.html");
115117
});
116118
});

‎apps/web/src/components/media/AttachmentImage.browser.test.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { act, render, stubGlobal } from "../../../test/render";
1+
import { act, render, stubGlobal, type Screen } from "../../../test/render";
22
import { expect, it, vi } from "vite-plus/test";
33
import { AttachmentImage } from "./AttachmentImage";
44
import { prepareImageForAttachment } from "../../lib/imageCompression";
@@ -20,15 +20,15 @@ function setup() {
2020
.mockResolvedValue({ ok: true, file: jpeg, recompressed: true });
2121
}
2222

23-
function image() {
24-
const img = document.querySelector("img");
23+
function image(screen: Screen) {
24+
const img = screen.container.querySelector("img");
2525
expect(img).not.toBeNull();
2626
return img!;
2727
}
2828

2929
// Stands in for the browser failing to decode the current source.
30-
async function failDecode() {
31-
const img = image();
30+
async function failDecode(screen: Screen) {
31+
const img = image(screen);
3232
await act(() => {
3333
img.dispatchEvent(new Event("error"));
3434
});
@@ -53,8 +53,8 @@ it.each([
5353
<AttachmentImage src="https://environment.test/photo" name={name} mimeType={mimeType} />,
5454
);
5555
expect(fetchImage).not.toHaveBeenCalled();
56-
await failDecode();
57-
await vi.waitFor(() => expect(image().getAttribute("src")).toBe("blob:jpeg"));
56+
await failDecode(screen);
57+
await vi.waitFor(() => expect(image(screen).getAttribute("src")).toBe("blob:jpeg"));
5858
expect(prepareImageForAttachment).toHaveBeenCalledWith(
5959
expect.objectContaining({ name, type: "image/heic" }),
6060
50 * 1024 * 1024,
@@ -70,10 +70,10 @@ it("leaves PNG errors to the caller without fetching or converting", async () =>
7070
using _createUrl = vi.spyOn(URL, "createObjectURL").mockReturnValue("blob:jpeg");
7171
using _revokeUrl = vi.spyOn(URL, "revokeObjectURL").mockImplementation(revokeUrl);
7272
const onError = vi.fn();
73-
await using _screen = await render(
73+
await using screen = await render(
7474
<AttachmentImage src="blob:png" name="photo.png" onError={onError} />,
7575
);
76-
expectDecodeErrorFor(onError, await failDecode());
76+
expectDecodeErrorFor(onError, await failDecode(screen));
7777
expect(fetchImage).not.toHaveBeenCalled();
7878
});
7979

@@ -84,10 +84,10 @@ it("reports failed HEIC conversion through the existing error handler", async ()
8484
using _revokeUrl = vi.spyOn(URL, "revokeObjectURL").mockImplementation(revokeUrl);
8585
const onError = vi.fn();
8686
vi.mocked(prepareImageForAttachment).mockResolvedValue({ ok: false, reason: "unreadable" });
87-
await using _screen = await render(
87+
await using screen = await render(
8888
<AttachmentImage src="blob:heic" name="photo.heif" onError={onError} />,
8989
);
90-
expectDecodeErrorFor(onError, await failDecode());
90+
expectDecodeErrorFor(onError, await failDecode(screen));
9191
expect(URL.createObjectURL).not.toHaveBeenCalled();
9292
});
9393

@@ -103,10 +103,10 @@ it("discards an old decode when navigating to a different source", async () => {
103103
}),
104104
);
105105
await using screen = await render(<AttachmentImage src="blob:first" name="photo.heic" />);
106-
await failDecode();
106+
await failDecode(screen);
107107
await screen.rerender(<AttachmentImage src="blob:second" name="photo.heic" />);
108108
await act(() => finishDecode({ ok: true, file: jpeg, recompressed: true }));
109-
expect(image().getAttribute("src")).toBe("blob:second");
109+
expect(image(screen).getAttribute("src")).toBe("blob:second");
110110
expect(URL.createObjectURL).not.toHaveBeenCalled();
111111
expect(fetchImage.mock.calls[0]?.[1].signal.aborted).toBe(true);
112112
});

‎apps/web/src/components/preview/PreviewEmptyState.browser.test.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { act, render } from "../../../test/render";
1+
import { act, render, type Screen } from "../../../test/render";
22
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
33
import { describe, expect, it, vi } from "vite-plus/test";
44

@@ -50,8 +50,8 @@ async function renderPreview(
5050
);
5151
}
5252

53-
function button(name: string) {
54-
const match = [...document.querySelectorAll("button")].find(
53+
function button(screen: Screen, name: string) {
54+
const match = [...screen.container.querySelectorAll("button")].find(
5555
(element) => element.getAttribute("aria-label") === name || element.textContent?.includes(name),
5656
);
5757
expect(match, `button ${name}`).toBeDefined();
@@ -72,10 +72,10 @@ describe("PreviewEmptyState", () => {
7272
expect(text).toContain("Recent Local");
7373
expect(text).toContain("node");
7474

75-
await act(async () => button("Admin").click());
75+
await act(async () => button(screen, "Admin").click());
7676
expect(onOpenUrl).toHaveBeenCalledExactlyOnceWith("https://myapp.test/admin#users");
7777

78-
await act(async () => button("Remove myapp.test/admin#users from history").click());
78+
await act(async () => button(screen, "Remove myapp.test/admin#users from history").click());
7979
expect(onRemoveRecent).toHaveBeenCalledExactlyOnceWith("https://myapp.test/admin#users");
8080
});
8181

@@ -96,6 +96,6 @@ describe("PreviewEmptyState", () => {
9696
setup();
9797
await using screen = await renderPreview([{ url: "https://myapp.test/", lastVisitedAt: 1e20 }]);
9898
expect(screen.container.textContent).toContain("myapp.test");
99-
button("Remove myapp.test from history");
99+
button(screen, "Remove myapp.test from history");
100100
});
101101
});

‎apps/web/src/components/preview/PreviewFaviconIcon.browser.test.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@ import { expect, it } from "vite-plus/test";
33

44
import { FaviconImage } from "./PreviewFaviconIcon";
55

6-
const GIF = "data:image/gif;base64,R0lGODlhAQABAAAAACw=";
6+
const GIF = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
77
const captured = `${GIF}#captured`;
88
const remote = `${GIF}#remote`;
99

10-
const image = () => document.querySelector("img");
11-
const failImage = () => act(async () => image()!.dispatchEvent(new Event("error")));
12-
1310
it("falls through failed favicon sources and retries when the source list changes", async () => {
1411
await using screen = await render(
1512
<FaviconImage sources={[captured, remote]} fallback={<span>fallback</span>} />,
16-
{ router: false },
1713
);
14+
const image = () => screen.container.querySelector("img");
15+
const failImage = () => act(async () => image()!.dispatchEvent(new Event("error")));
1816
expect(image()?.getAttribute("src")).toBe(captured);
1917

2018
await failImage();

‎apps/web/src/components/pullRequest/PullRequestMarkdownEditor.browser.test.tsx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { act, render } from "../../../test/render";
1+
import { act, render, type Screen } from "../../../test/render";
22
import { AuthSourceControlWriteScope, EnvironmentId } from "@t3tools/contracts";
33
import { expect, it, vi } from "vite-plus/test";
44
import { userEvent } from "vite-plus/test/browser";
@@ -55,15 +55,15 @@ async function openEditor(options?: { value?: string; allowEmpty?: boolean }) {
5555
);
5656
}
5757

58-
function button(label: string) {
59-
const match = [...document.querySelectorAll("button")].find(
58+
function button(screen: Screen, label: string) {
59+
const match = [...screen.container.querySelectorAll("button")].find(
6060
(element) => element.textContent === label,
6161
);
6262
expect(match, `button ${label}`).toBeDefined();
6363
return match!;
6464
}
6565

66-
const clickSave = () => act(async () => button("Save").click());
66+
const clickSave = (screen: Screen) => act(async () => button(screen, "Save").click());
6767

6868
async function grant(allowed: boolean) {
6969
await act(async () => {
@@ -76,73 +76,73 @@ async function grant(allowed: boolean) {
7676
it("does not save a secondary environment's description using the primary grant", async () => {
7777
setup();
7878
permissions.allowed.add(primary);
79-
await using _screen = await openEditor();
79+
await using screen = await openEditor();
8080

81-
expect(button("Save").disabled).toBe(true);
82-
await clickSave();
81+
expect(button(screen, "Save").disabled).toBe(true);
82+
await clickSave(screen);
8383

8484
expect(onSave).not.toHaveBeenCalled();
8585
});
8686

8787
it("rejects a Save click when the grant changes before React updates", async () => {
8888
setup();
8989
permissions.allowed.add(secondary);
90-
await using _screen = await openEditor();
90+
await using screen = await openEditor();
9191
permissions.allowed.delete(secondary);
9292

93-
expect(button("Save").disabled).toBe(false);
94-
await clickSave();
93+
expect(button(screen, "Save").disabled).toBe(false);
94+
await clickSave(screen);
9595

9696
expect(onSave).not.toHaveBeenCalled();
9797
});
9898

9999
it("keeps an edited draft through revocation and saves it after access returns without remounting", async () => {
100100
setup();
101101
permissions.allowed.add(secondary);
102-
await using _screen = await openEditor();
103-
const textarea = document.querySelector("textarea")!;
102+
await using screen = await openEditor();
103+
const textarea = screen.container.querySelector("textarea")!;
104104
await userEvent.clear(textarea);
105105
await userEvent.type(textarea, "Keep these unsaved edits");
106106

107107
await grant(false);
108-
expect(button("Save").disabled).toBe(true);
109-
expect(document.querySelector("textarea")).toBe(textarea);
108+
expect(button(screen, "Save").disabled).toBe(true);
109+
expect(screen.container.querySelector("textarea")).toBe(textarea);
110110

111111
await grant(true);
112-
await clickSave();
112+
await clickSave(screen);
113113
expect(onSave).toHaveBeenCalledExactlyOnceWith("Keep these unsaved edits");
114114
});
115115

116116
it("saves with source-control permission alone, from the button or Cmd/Ctrl+Enter", async () => {
117117
setup();
118118
permissions.allowed.add(secondary);
119-
await using _screen = await openEditor();
119+
await using screen = await openEditor();
120120

121-
await clickSave();
121+
await clickSave(screen);
122122
expect(onSave).toHaveBeenCalledExactlyOnceWith("Original description");
123123

124-
document.querySelector("textarea")!.focus();
124+
screen.container.querySelector("textarea")!.focus();
125125
await userEvent.keyboard("{Control>}{Enter}{/Control}");
126126
expect(onSave).toHaveBeenCalledTimes(2);
127127
});
128128

129129
it("allows clearing a description only after a pending grant becomes available", async () => {
130130
setup();
131-
await using _screen = await openEditor({ value: "", allowEmpty: true });
132-
await clickSave();
131+
await using screen = await openEditor({ value: "", allowEmpty: true });
132+
await clickSave(screen);
133133
expect(onSave).not.toHaveBeenCalled();
134134

135135
await grant(true);
136-
await clickSave();
136+
await clickSave(screen);
137137
expect(onSave).toHaveBeenCalledExactlyOnceWith("");
138138
});
139139

140140
it("keeps cancelling a local edit available without a write grant", async () => {
141141
setup();
142-
await using _screen = await openEditor();
142+
await using screen = await openEditor();
143143

144-
await act(async () => button("Cancel").click());
145-
document.querySelector("textarea")!.focus();
144+
await act(async () => button(screen, "Cancel").click());
145+
screen.container.querySelector("textarea")!.focus();
146146
await userEvent.keyboard("{Escape}");
147147

148148
expect(onCancel).toHaveBeenCalledTimes(2);

‎apps/web/src/components/pullRequest/usePullRequestFilesViewed.browser.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ describe("a failed batch that the host partly applied", () => {
172172
);
173173
host.refresh.mockImplementation(() => {
174174
host.data = answer("viewed");
175-
void screen.rerender();
176175
});
177176
await act(() => {
178177
view().setViewed("a.ts", true);
179178
view().setViewed("b.ts", true);
180179
});
181180
await act(async () => vi.advanceTimersByTimeAsync(500));
181+
await screen.rerender();
182182
expect(view().isViewed("a.ts")).toBe(true);
183183
expect(view().isViewed("b.ts")).toBe(false);
184184
});

0 commit comments

Comments
 (0)