diff --git a/src/main/browser/guest-lifecycle/manager/browser-manager-guest-visibility.test.ts b/src/main/browser/guest-lifecycle/manager/browser-manager-guest-visibility.test.ts index 51dff485ff3..1660c93c64d 100644 --- a/src/main/browser/guest-lifecycle/manager/browser-manager-guest-visibility.test.ts +++ b/src/main/browser/guest-lifecycle/manager/browser-manager-guest-visibility.test.ts @@ -86,6 +86,7 @@ describe('browserManager', () => { const guest = { id: 1711, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: vi.fn(), @@ -143,6 +144,7 @@ describe('browserManager', () => { const makeGuest = (id: number) => ({ id, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: vi.fn(), diff --git a/src/main/browser/guest-lifecycle/manager/devtools/browser-manager-devtools-retirement.test.ts b/src/main/browser/guest-lifecycle/manager/devtools/browser-manager-devtools-retirement.test.ts index c83230f0d52..8e036ff4d48 100644 --- a/src/main/browser/guest-lifecycle/manager/devtools/browser-manager-devtools-retirement.test.ts +++ b/src/main/browser/guest-lifecycle/manager/devtools/browser-manager-devtools-retirement.test.ts @@ -62,6 +62,7 @@ function createGuest(id: number) { getURL: () => 'https://example.com/', isCurrentlyAudible: () => false, isDestroyed: () => destroyed, + isCrashed: () => false, isDevToolsOpened: () => opened, setWindowOpenHandler: vi.fn(), setDevToolsWebContents: vi.fn((host: DevToolsHost) => { diff --git a/src/main/browser/guest-lifecycle/manager/downloads/browser-manager-client-hosted-downloads.test.ts b/src/main/browser/guest-lifecycle/manager/downloads/browser-manager-client-hosted-downloads.test.ts index eed58334674..3c3fb904d05 100644 --- a/src/main/browser/guest-lifecycle/manager/downloads/browser-manager-client-hosted-downloads.test.ts +++ b/src/main/browser/guest-lifecycle/manager/downloads/browser-manager-client-hosted-downloads.test.ts @@ -178,6 +178,7 @@ function createGuest(id: number) { return { id, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: browserMocks.guestSetBackgroundThrottlingMock, diff --git a/src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-test-harness.ts b/src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-test-harness.ts index 6cbc482dcf4..0de7d76624c 100644 --- a/src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-test-harness.ts +++ b/src/main/browser/guest-lifecycle/manager/grab/browser-manager-grab-test-harness.ts @@ -26,6 +26,7 @@ export function makeGuest(id: number, mocks: GrabTestMocks): Electron.WebContent return { id, isDestroyed: mocks.guestIsDestroyedMock, + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: mocks.guestSetBackgroundThrottlingMock, diff --git a/src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-routing.test.ts b/src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-routing.test.ts index 49f30d15008..86e03a842cd 100644 --- a/src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-routing.test.ts +++ b/src/main/browser/guest-lifecycle/manager/popups/browser-manager-popup-routing.test.ts @@ -81,6 +81,7 @@ describe('browserManager', () => { const guest = { id: 144, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: guestSetBackgroundThrottlingMock, @@ -168,6 +169,7 @@ describe('browserManager', () => { const guest = { id: 150, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: guestSetBackgroundThrottlingMock, @@ -209,6 +211,7 @@ describe('browserManager', () => { const child = { id: 1500 + index, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), setBackgroundThrottling: vi.fn(), diff --git a/src/main/browser/guest-lifecycle/manager/registration/browser-manager-page-prompt-routing.test.ts b/src/main/browser/guest-lifecycle/manager/registration/browser-manager-page-prompt-routing.test.ts index 35d74509c88..2f99ed391c1 100644 --- a/src/main/browser/guest-lifecycle/manager/registration/browser-manager-page-prompt-routing.test.ts +++ b/src/main/browser/guest-lifecycle/manager/registration/browser-manager-page-prompt-routing.test.ts @@ -71,6 +71,7 @@ describe('browserManager page prompt routing', () => { const guest = { id: 107, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), getURL: vi.fn(() => 'https://trusted.example/home'), @@ -163,6 +164,7 @@ describe('browserManager page prompt routing', () => { const guest = { id: 109, isDestroyed: vi.fn(() => false), + isCrashed: vi.fn(() => false), isCurrentlyAudible: vi.fn(() => false), getType: vi.fn(() => 'webview'), getURL: vi.fn(() => ''), diff --git a/src/main/browser/guest-lifecycle/manager/viewport/browser-manager-tab-identity.test.ts b/src/main/browser/guest-lifecycle/manager/viewport/browser-manager-tab-identity.test.ts index d57e0a5ef31..89185a7d7cf 100644 --- a/src/main/browser/guest-lifecycle/manager/viewport/browser-manager-tab-identity.test.ts +++ b/src/main/browser/guest-lifecycle/manager/viewport/browser-manager-tab-identity.test.ts @@ -80,11 +80,13 @@ function openTab(url: string): { tab: string; id: number; handle: ViewportGuestH } function navigate(url: string, { inPlace = false } = {}): void { - const didStartNavigation = mocks.guestOnMock.mock.calls.findLast( + const didStartNavigation = mocks.guestOnMock.mock.calls.filter( ([event]) => event === 'did-start-navigation' - )?.[1] - expect(didStartNavigation).toBeTypeOf('function') - didStartNavigation(null, url, inPlace, true) + ) + expect(didStartNavigation.length).toBeGreaterThan(0) + for (const [, listener] of didStartNavigation) { + listener({ url, isSameDocument: inPlace, isMainFrame: true }, url, inPlace, true) + } } function failDeviceMetrics(handle: ViewportGuestHandle): void { diff --git a/src/preload/browser-window-close-installation.test.ts b/src/preload/browser-window-close-installation.test.ts index afca315c1a2..521a6dca441 100644 --- a/src/preload/browser-window-close-installation.test.ts +++ b/src/preload/browser-window-close-installation.test.ts @@ -27,7 +27,7 @@ describe('browser window close guard', () => { it.each([true, false])('routes a close only from the top frame: %s', (isMainFrame) => { const sendToHost = vi.fn() const nativeClose = vi.fn() - const pageWindow = { close: nativeClose } + const pageWindow = { close: nativeClose, addEventListener: vi.fn() } const preload = buildSync({ entryPoints: [fileURLToPath(new URL('./browser-guest.ts', import.meta.url))], bundle: true, @@ -39,11 +39,12 @@ describe('browser window close guard', () => { runInNewContext(preload, { window: pageWindow, + document: { addEventListener: vi.fn() }, process: { isMainFrame }, require: (name: string) => { expect(name).toBe('electron') return { - ipcRenderer: { sendToHost }, + ipcRenderer: { sendToHost, send: vi.fn(), on: vi.fn() }, contextBridge: { executeInMainWorld: (script: { func: (requestClose: () => void) => void