diff --git a/packages/puppeteer-core/src/common/bidi/Page.ts b/packages/puppeteer-core/src/common/bidi/Page.ts index ffd439eb..d70f5036 100644 --- a/packages/puppeteer-core/src/common/bidi/Page.ts +++ b/packages/puppeteer-core/src/common/bidi/Page.ts @@ -394,6 +394,10 @@ export class Page extends PageBase { return this.#networkManager.getNavigationResponse(id); } + override isClosed(): boolean { + return this.#closedDeferred.finished(); + } + override async close(): Promise { if (this.#closedDeferred.finished()) { return; diff --git a/test/TestExpectations.json b/test/TestExpectations.json index f4b1e0a7..7ab43d60 100644 --- a/test/TestExpectations.json +++ b/test/TestExpectations.json @@ -71,6 +71,12 @@ "parameters": [], "expectations": ["PASS"] }, + { + "testIdPattern": "[injected.spec] PuppeteerUtil tests *", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["webDriverBiDi"], + "expectations": ["PASS"] + }, { "testIdPattern": "[jshandle.spec] *", "platforms": ["darwin", "linux", "win32"], @@ -1181,6 +1187,18 @@ "parameters": ["webDriverBiDi"], "expectations": ["PASS"] }, + { + "testIdPattern": "[page.spec] Page Page.close should set the page close state", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["webDriverBiDi"], + "expectations": ["PASS"] + }, + { + "testIdPattern": "[page.spec] Page Page.close should terminate network waiters", + "platforms": ["darwin", "linux", "win32"], + "parameters": ["webDriverBiDi"], + "expectations": ["PASS"] + }, { "testIdPattern": "[page.spec] Page Page.Events.Close should work with page.close", "platforms": ["darwin", "linux", "win32"], @@ -3964,11 +3982,5 @@ "platforms": ["darwin", "linux", "win32"], "parameters": ["cdp", "chrome", "headless"], "expectations": ["FAIL", "PASS"] - }, - { - "testIdPattern": "[injected.spec] PuppeteerUtil tests *", - "platforms": ["darwin", "linux", "win32"], - "parameters": ["webDriverBiDi"], - "expectations": ["PASS"] } ] diff --git a/test/src/launcher.spec.ts b/test/src/launcher.spec.ts index 68009241..41d29754 100644 --- a/test/src/launcher.spec.ts +++ b/test/src/launcher.spec.ts @@ -107,7 +107,10 @@ describe('Launcher specs', function () { ]); for (let i = 0; i < 2; i++) { const message = results[i].message; - expect(message).toContain('Target closed'); + expect(message).atLeastOneToContain([ + 'Target closed', + 'Page closed!', + ]); expect(message).not.toContain('Timeout'); } } finally { diff --git a/test/src/page.spec.ts b/test/src/page.spec.ts index ca45d2d0..6bb16c74 100644 --- a/test/src/page.spec.ts +++ b/test/src/page.spec.ts @@ -110,7 +110,7 @@ describe('Page', function () { ]); for (let i = 0; i < 2; i++) { const message = results[i].message; - expect(message).toContain('Target closed'); + expect(message).atLeastOneToContain(['Target closed', 'Page closed!']); expect(message).not.toContain('Timeout'); } });