From 1dc938cc67fadb1166362fbf5546b7586643dfc6 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 28 Feb 2023 13:21:46 -0800 Subject: [PATCH] test: make waitForNavigation pass in ff (#1220) --- .../playwright/TestPageWaitForNavigation.java | 12 +++++++----- .../com/microsoft/playwright/TestPageWaitForUrl.java | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java index 0c2ff235..422e22a2 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java +++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForNavigation.java @@ -58,19 +58,21 @@ public class TestPageWaitForNavigation extends TestBase { @Test void shouldWorkWithCommit() { + server.setRoute("/script.js", exchange -> {}); server.setRoute("/empty.html", exchange -> { exchange.getResponseHeaders().add("Content-Type", "text/html"); - exchange.sendResponseHeaders(200, 8192); - OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody()); - writer.write("" + String.join("", nCopies(4100, "A"))); - writer.flush(); + exchange.sendResponseHeaders(200, 0); + try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) { + writer.write("<title>Hello"); + } }); page.waitForNavigation(new Page.WaitForNavigationOptions().setWaitUntil(WaitUntilState.COMMIT), () -> { try { - page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(100)); + page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(1000)); } catch (TimeoutError e) { } }); + assertEquals("Hello", page.title()); } @Test diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java index 053edca9..6fd1e3ec 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java +++ b/playwright/src/test/java/com/microsoft/playwright/TestPageWaitForUrl.java @@ -52,18 +52,20 @@ public class TestPageWaitForUrl extends TestBase { @Test void shouldWorkWithCommit() { + server.setRoute("/script.js", exchange -> {}); server.setRoute("/empty.html", exchange -> { exchange.getResponseHeaders().add("Content-Type", "text/html"); - exchange.sendResponseHeaders(200, 8192); - OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody()); - writer.write("" + String.join("", nCopies(4100, "A"))); - writer.flush(); + exchange.sendResponseHeaders(200, 0); + try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) { + writer.write("<title>Hello"); + } }); try { page.navigate(server.EMPTY_PAGE, new Page.NavigateOptions().setTimeout(100)); } catch (TimeoutError e) { } page.waitForURL("**/empty.html", new Page.WaitForURLOptions().setWaitUntil(WaitUntilState.COMMIT)); + assertEquals("Hello", page.title()); } @Test