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
44 changes: 24 additions & 20 deletions apps/web/src/browser/ElectronBrowserHost.browser.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { AsyncResult, Atom } from "effect/reactivity";
import { describe, expect, it, vi } from "vite-plus/test";

import { act, fakeTimers, render, stubGlobal } from "../../test/render";
import { createPreviewBridgeFixture } from "../../test/previewBridge";

const mocks = vi.hoisted(() => ({
getClientSettings: vi.fn<() => Promise<ClientSettings | null>>(),
Expand Down Expand Up @@ -59,16 +60,19 @@ vi.mock(import("~/localApi"), async (original) => {
});

// The Electron desktop bridge; a browser has none.
vi.mock(import("~/components/preview/previewBridge"), async (original) => ({
...(await original()),
previewBridge: {
createTab: mocks.createTab,
closeTab: mocks.closeTab,
registerWebview: mocks.registerWebview,
setShown: mocks.setShown,
getPreviewConfig: mocks.getPreviewConfig,
} as never,
}));
vi.mock(import("~/components/preview/previewBridge"), async (original) => {
const { createPreviewBridgeFixture } = await import("../../test/previewBridge");
return {
...(await original()),
previewBridge: createPreviewBridgeFixture({
createTab: mocks.createTab,
closeTab: mocks.closeTab,
registerWebview: mocks.registerWebview,
setShown: mocks.setShown,
getPreviewConfig: mocks.getPreviewConfig,
}),
};
});

vi.mock(import("~/components/preview/usePreviewBridge"), async (original) => ({
...(await original()),
Expand Down Expand Up @@ -270,7 +274,7 @@ describe("ElectronBrowserHost", () => {
const navigate = vi.fn().mockResolvedValue(undefined);
using _desktopBridge = stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
refresh,
navigate,
browserPresentation: async () => undefined,
Expand All @@ -279,7 +283,7 @@ describe("ElectronBrowserHost", () => {
onOpenLink: () => () => undefined,
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
await using tab = await mountActivityTab("reconnect");
const { release, container } = tab;
Expand Down Expand Up @@ -418,7 +422,7 @@ describe("ElectronBrowserHost", () => {
const refresh = vi.fn<DesktopPreviewBridge["refresh"]>().mockResolvedValue(undefined);
using _desktopBridge = stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
navigate,
refresh,
browserPresentation: async () => undefined,
Expand All @@ -427,7 +431,7 @@ describe("ElectronBrowserHost", () => {
onOpenLink: () => () => undefined,
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
let release = acquireBrowserSurfaceActivity(runtimeTabId);
reconcilePreviewServerSessions(threadRef, {
Expand Down Expand Up @@ -488,7 +492,7 @@ describe("ElectronBrowserHost", () => {
});
using _desktopBridge = stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
refresh,
navigate,
browserPresentation: async () => undefined,
Expand All @@ -497,7 +501,7 @@ describe("ElectronBrowserHost", () => {
onOpenLink: () => () => undefined,
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
await using tab = await mountActivityTab("new-destination", initialUrl);
const { initial, prepare, runtimeTabId, release, container } = tab;
Expand Down Expand Up @@ -580,7 +584,7 @@ describe("ElectronBrowserHost", () => {
const refresh = vi.fn<DesktopPreviewBridge["refresh"]>().mockResolvedValue(undefined);
using _desktopBridge = stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
navigate,
refresh,
browserPresentation: async () => undefined,
Expand All @@ -589,7 +593,7 @@ describe("ElectronBrowserHost", () => {
onOpenLink: () => () => undefined,
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
await using tab = await mountActivityTab("recovered-destination");
const { initial, prepare, runtimeTabId, release, container } = tab;
Expand Down Expand Up @@ -653,7 +657,7 @@ describe("ElectronBrowserHost", () => {
let rendererRequest: ((request: DesktopBrowserRendererRequest) => void) | undefined;
using _desktopBridge = stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
onBrowserRendererRequest: (listener: typeof rendererRequest) => {
rendererRequest = listener;
return () => {
Expand All @@ -666,7 +670,7 @@ describe("ElectronBrowserHost", () => {
onOpenLink: () => () => undefined,
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
const createElement = document.createElement.bind(document);
using _createElement = vi.spyOn(document, "createElement").mockImplementation(((
Expand Down
39 changes: 21 additions & 18 deletions apps/web/src/browser/HostedBrowserWebview.browser.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import type { ReactNode } from "react";

import "~/index.css";
import { act, fakeTimers, render as renderUi, type Screen } from "../../test/render";
import { createPreviewBridgeFixture } from "../../test/previewBridge";
import { describe, expect, it, vi } from "vite-plus/test";
import type { previewBridge } from "~/components/preview/previewBridge";

const mocks = vi.hoisted(() => ({
getClientSettings: vi.fn<() => Promise<ClientSettings | null>>(),
Expand All @@ -46,17 +46,20 @@ vi.mock(import("~/components/preview/previewHostingRecovery"), { spy: true });
vi.mock(import("./browserDefaults"), { spy: true });

// The Electron desktop bridge; a browser has none.
vi.mock(import("~/components/preview/previewBridge"), async (original) => ({
...(await original()),
previewBridge: {
createTab: mocks.createTab,
closeTab: mocks.closeTab,
registerWebview: mocks.registerWebview,
getPreviewConfig: mocks.getPreviewConfig,
setColorScheme: async () => undefined,
setZoomFactor: async () => undefined,
} as unknown as NonNullable<typeof previewBridge>,
}));
vi.mock(import("~/components/preview/previewBridge"), async (original) => {
const { createPreviewBridgeFixture } = await import("../../test/previewBridge");
return {
...(await original()),
previewBridge: createPreviewBridgeFixture({
createTab: mocks.createTab,
closeTab: mocks.closeTab,
registerWebview: mocks.registerWebview,
getPreviewConfig: mocks.getPreviewConfig,
setColorScheme: async () => undefined,
setZoomFactor: async () => undefined,
}),
};
});

vi.mock(import("~/env"), async (original) => ({ ...(await original()), isElectron: true }));
vi.mock("~/hooks/useTheme", () => ({ useTheme: () => ({ resolvedTheme: "light" }) }));
Expand Down Expand Up @@ -267,14 +270,14 @@ describe("Electron browser hosting outside the selected thread", () => {
let onOpenLink!: Parameters<DesktopPreviewBridge["onOpenLink"]>[0];
vi.stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
onOpenLink: (listener: typeof onOpenLink) => {
onOpenLink = listener;
return () => undefined;
},
onPointerEvent: () => () => undefined,
setAnnotationTheme: async () => undefined,
},
}),
});
using _host = { [Symbol.dispose]: startElectronBrowserHost() };
const url = "http://localhost:5173/qa";
Expand Down Expand Up @@ -358,14 +361,14 @@ describe("Electron browser hosting outside the selected thread", () => {
let onOpenLink!: Parameters<DesktopPreviewBridge["onOpenLink"]>[0];
vi.stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
onOpenLink: (listener: typeof onOpenLink) => {
onOpenLink = listener;
return () => undefined;
},
onPointerEvent: () => () => undefined,
setAnnotationTheme: async () => undefined,
},
}),
});
using _host = { [Symbol.dispose]: startElectronBrowserHost() };
const failure = new Error("Preview recovery unavailable.");
Expand Down Expand Up @@ -914,12 +917,12 @@ describe("HostedBrowserWebview settings hydration", () => {
const browserPresentation = vi.fn(async () => undefined);
vi.stubGlobal("desktopBridge", {
getWindowZoomFactor: () => 1,
preview: {
preview: createPreviewBridgeFixture({
browserPresentation,
setShown: vi.fn<DesktopPreviewBridge["setShown"]>(async () => undefined),
onBrowserSurfaceRequest: () => () => undefined,
browserSurfaceResponse: async () => undefined,
},
}),
});
const runtimeTabId = "native-presentation";
const owner = Symbol("browser-slot");
Expand Down
Loading