Skip to content

Commit 1d06a09

Browse files
committed
test: fix failures on firefox, webkit and windows bots
- connectOverCDP is now supported in WebKit: skip the not-chromium test there and expect the new error message - accept all close-time messages in waitForNavigation-after-disconnect - wait 2s for page errors to accumulate, mirrors upstream #38378 - regenerate firefox screenshot expectations for Firefox 151
1 parent 0e3b273 commit 1d06a09

5 files changed

Lines changed: 10 additions & 4 deletions

File tree

playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,14 @@ void browserTypeNameShouldWork() {
4040
assertEquals(getBrowserNameFromEnv(), browserType.name());
4141
}
4242

43+
static boolean isChromiumOrWebKit() {
44+
return isChromium() || isWebKit();
45+
}
46+
4347
@Test
44-
@DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Non-chromium behavior")
48+
@DisabledIf(value="isChromiumOrWebKit", disabledReason="Connecting over CDP is supported in Chromium and WebKit")
4549
void shouldThrowWhenTryingToConnectWithNotChromium() {
4650
PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserType.connectOverCDP("foo"));
47-
assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium."));
51+
assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium and WebKit."));
4852
}
4953
}

playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ void shouldThrowWhenCallingWaitForNavigationAfterDisconnect() throws Interrupted
259259
}
260260
assertFalse(browser.isConnected());
261261
PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForNavigation(() -> {}));
262-
assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
262+
assertTrue(e.getMessage().contains("Browser closed") ||
263+
e.getMessage().contains("Page closed") ||
264+
e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
263265
}
264266

265267
@Test

playwright/src/test/java/com/microsoft/playwright/TestPageEventPageError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void pageErrorsShouldWork() {
3030
page.evaluate("async () => {\n" +
3131
" for (let i = 0; i < 301; i++)\n" +
3232
" window.setTimeout(() => { throw new Error('error' + i); }, 0);\n" +
33-
" await new Promise(f => window.setTimeout(f, 100));\n" +
33+
" await new Promise(f => window.setTimeout(f, 2000));\n" +
3434
" }");
3535

3636
List<String> errors = page.pageErrors();
-6.28 KB
Loading
-6.43 KB
Loading

0 commit comments

Comments
 (0)