From 13dc9dd1a5b93c9d93a01397ee7306e8878f4c89 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 2 May 2023 11:37:30 -0700 Subject: [PATCH 1/2] chore: roll driver to 1.33.0 --- scripts/CLI_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/CLI_VERSION b/scripts/CLI_VERSION index bee4c00f6..7aa332e41 100644 --- a/scripts/CLI_VERSION +++ b/scripts/CLI_VERSION @@ -1 +1 @@ -1.33.0-beta-1682447195000 +1.33.0 From ecb74921723e03b2c99bc55d679f85d2efbdd382 Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Tue, 2 May 2023 11:59:54 -0700 Subject: [PATCH 2/2] Simplify shouldClickTheButtonWithOffsetWithPageScale --- .../com/microsoft/playwright/TestClick.java | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClick.java b/playwright/src/test/java/com/microsoft/playwright/TestClick.java index 369a75115..8dfce5462 100644 --- a/playwright/src/test/java/com/microsoft/playwright/TestClick.java +++ b/playwright/src/test/java/com/microsoft/playwright/TestClick.java @@ -405,6 +405,12 @@ void shouldClickAButtonInScrollingContainerWithOffset() { assertEquals(isWebKit() ? 1910 + 8 : 1910, page.evaluate("offsetY")); } + private static void expectCloseTo(double expected, double actual) { + if (Math.abs(expected - actual) > 2) + fail("Expected: " + expected + ", received: " + actual); + } + + @Test @DisabledIf(value="com.microsoft.playwright.TestBase#isFirefox", disabledReason="skip") void shouldClickTheButtonWithOffsetWithPageScale() { @@ -419,28 +425,10 @@ void shouldClickTheButtonWithOffsetWithPageScale() { "}"); page.click("button", new Page.ClickOptions().setPosition(20, 10)); assertEquals("Clicked", page.evaluate("result")); - // 20;10 + 8px of border in each direction - int expectedX = 28; - int expectedY = 18; - - if (isWebKit()) { - // WebKit for macOS 12 has different expectations starting r1829. - if (isMac && Utils.osVersion() < 12) { - // WebKit rounds up during css -> dip -> css conversion. - expectedX = 26; - expectedY = 17; - } else { - expectedX = 29; - expectedY = 19; - } - } else if (isChromium() && !headful) { - // Headless Chromium rounds down during css -> dip -> css conversion. - expectedX = 27; - expectedY = 18; - } - - assertEquals(expectedX, Math.round((Integer) page.evaluate("pageX") + 0.01)); - assertEquals(expectedY, Math.round((Integer) page.evaluate("pageY") + 0.01)); + // Expect 20;10 + 8px of border in each direction. Allow some delta as different + // browsers round up or down differently during css -> dip -> css conversion. + expectCloseTo(28, (Integer) page.evaluate("pageX")); + expectCloseTo(18, (Integer) page.evaluate("pageY")); context.close(); }