diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml index 6c0c72bd341c3..63727764a0953 100644 --- a/.github/workflows/ci-java.yml +++ b/.github/workflows/ci-java.yml @@ -28,7 +28,8 @@ jobs: //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest ` //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ` //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest ` - //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest + //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ` + //java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest browser-tests-macos: name: Browser Tests diff --git a/.skipped-tests b/.skipped-tests index 61c07d731a010..88eb59305ca8b 100644 --- a/.skipped-tests +++ b/.skipped-tests @@ -6,6 +6,8 @@ -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-edge -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-remote +-//java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest +-//java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest-remote -//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest -//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest -//java/test/org/openqa/selenium/grid/gridui:OverallGridTest @@ -45,8 +47,10 @@ -//rb/spec/integration/selenium/webdriver/remote:element-edge-remote -//rb/spec/integration/selenium/webdriver/remote:element-firefox-beta-remote -//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote +-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote -//rb/spec/integration/selenium/webdriver:element-chrome -//rb/spec/integration/selenium/webdriver:element-chrome-bidi -//rb/spec/integration/selenium/webdriver:element-chrome-remote --//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote +-//rb/spec/integration/selenium/webdriver:manager-firefox-beta +-//rb/spec/integration/selenium/webdriver:manager-firefox-beta-remote -//rb:lint diff --git a/common/repositories.bzl b/common/repositories.bzl index 1faed68741602..ce4adae228aa0 100644 --- a/common/repositories.bzl +++ b/common/repositories.bzl @@ -11,8 +11,8 @@ def pin_browsers(): http_archive( name = "linux_firefox", - url = "https://ftp.mozilla.org/pub/firefox/releases/140.0.4/linux-x86_64/en-US/firefox-140.0.4.tar.xz", - sha256 = "63e0033e6f4dd0576074de3cf1f70feec43359f923ed9055e554cf84b13856f6", + url = "https://ftp.mozilla.org/pub/firefox/releases/141.0.2/linux-x86_64/en-US/firefox-141.0.2.tar.xz", + sha256 = "bfdef92fed2171068f964eb991e849e546454545249b0271b6ccf18a51a43d6f", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -33,8 +33,8 @@ js_library( dmg_archive( name = "mac_firefox", - url = "https://ftp.mozilla.org/pub/firefox/releases/140.0.4/mac/en-US/Firefox%20140.0.4.dmg", - sha256 = "e97d88d6ac04766cc52963d0d8f567bd39464bfc612167cd81627e6bb22d1d8c", + url = "https://ftp.mozilla.org/pub/firefox/releases/141.0.2/mac/en-US/Firefox%20141.0.2.dmg", + sha256 = "1cd69b03bcf48b9eef1b5221bd4297469d60026139f29213b571e32a993fe2f8", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -50,8 +50,8 @@ js_library( http_archive( name = "linux_beta_firefox", - url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b9/linux-x86_64/en-US/firefox-141.0b9.tar.xz", - sha256 = "5a89acdfeecef444ff167635308fde601317331a6537ba379897b77a636496be", + url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/linux-x86_64/en-US/firefox-142.0b8.tar.xz", + sha256 = "52c7c24dcc1258c9cd43c7b070def0a93bae58d2f5d077d11a7979307857e5c2", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -72,8 +72,8 @@ js_library( dmg_archive( name = "mac_beta_firefox", - url = "https://ftp.mozilla.org/pub/firefox/releases/141.0b9/mac/en-US/Firefox%20141.0b9.dmg", - sha256 = "e105272ffa164d501a78b3a407fef1afcac80cab4b9e03de07f3599e8ce39588", + url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/mac/en-US/Firefox%20142.0b8.dmg", + sha256 = "74c20a61fcc05fd69427f370a6a97ab660615299ef254d4cfaa617ec095dba98", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -123,10 +123,10 @@ js_library( pkg_archive( name = "mac_edge", - url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/e6174f66-8a94-4831-ad47-f7c4c12f4eca/MicrosoftEdge-138.0.3351.83.pkg", - sha256 = "deea1024b09afcc0ffca83ecb350044e5e960eae6b282779e2b6213e0f499f6a", + url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/26f80b70-962a-42b4-9bf0-735972466fd4/MicrosoftEdge-138.0.3351.121.pkg", + sha256 = "067d913a1c39bd5b6d480e88ecf77ba3954f3417954da7874c56056d87b05718", move = { - "MicrosoftEdge-138.0.3351.83.pkg/Payload/Microsoft Edge.app": "Edge.app", + "MicrosoftEdge-138.0.3351.121.pkg/Payload/Microsoft Edge.app": "Edge.app", }, build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") @@ -143,8 +143,8 @@ js_library( deb_archive( name = "linux_edge", - url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_138.0.3351.83-1_amd64.deb", - sha256 = "35c0f0db8f3797e566060af851edaf666145b3765d589bec7ecb9beecb4c10e1", + url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_138.0.3351.121-1_amd64.deb", + sha256 = "d4e8ba436ff63e4d011bddfb223d3323bb600529f084fc06c77e1bf879695d35", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -165,8 +165,8 @@ js_library( http_archive( name = "linux_edgedriver", - url = "https://msedgedriver.microsoft.com/138.0.3351.83/edgedriver_linux64.zip", - sha256 = "ed7d3651a5087bf7cdd383c244de29fa9e6a347473ff53c0172583380c5f7256", + url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_linux64.zip", + sha256 = "1a0bed812b1b84f1093fa1e759cae2a210481620cd9ea3cb91dc2a60e0b21e4d", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -182,8 +182,8 @@ js_library( http_archive( name = "mac_edgedriver", - url = "https://msedgedriver.microsoft.com/138.0.3351.83/edgedriver_mac64.zip", - sha256 = "a9e267a880300ed8dc77fc4ff12d4a66b49e3443d23c1091af277f332b2fc041", + url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_mac64.zip", + sha256 = "96b648865de254ae5db7008676340b16476e39b0b90c2da71964c14cb53a0195", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -199,8 +199,8 @@ js_library( http_archive( name = "linux_chrome", - url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.94/linux64/chrome-linux64.zip", - sha256 = "7766500a69967e997814d694d32a11d60b65462473210d606118461b254607b5", + url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/linux64/chrome-linux64.zip", + sha256 = "4ee01c09848cce8cbb0b2ad1a86571caf9889bf771f01225ea4bb83eeec8da8a", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -220,8 +220,8 @@ js_library( ) http_archive( name = "mac_chrome", - url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.94/mac-x64/chrome-mac-x64.zip", - sha256 = "4eeb938a161b3eddf04f6fd1bdb5b1857003446329a5d247d535b020c076ae4d", + url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/mac-x64/chrome-mac-x64.zip", + sha256 = "9c1e521e9887ff4e21061ad142a22de522e91b3279544e08f510633549c0ff21", strip_prefix = "chrome-mac-x64", patch_cmds = [ "mv 'Google Chrome for Testing.app' Chrome.app", @@ -241,8 +241,8 @@ js_library( ) http_archive( name = "linux_chromedriver", - url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.94/linux64/chromedriver-linux64.zip", - sha256 = "59db6a59947f6f623cd66c56ce6532df96b14f3e8350144a3a246f9b51ffc28c", + url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/linux64/chromedriver-linux64.zip", + sha256 = "54e7a0bd1050018c17dc529167a5deecb9dd709ecbb926be6d9599a22e86e22a", strip_prefix = "chromedriver-linux64", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") @@ -259,8 +259,8 @@ js_library( http_archive( name = "mac_chromedriver", - url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.94/mac-x64/chromedriver-mac-x64.zip", - sha256 = "3330c58df57b75b166286aac87ce2da2587d2cb6789eb7423551391c4f489e51", + url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/mac-x64/chromedriver-mac-x64.zip", + sha256 = "12ed690058dbffa45e0239675a7b70bf232de14f8c95c9a717ca33482cdd52b6", strip_prefix = "chromedriver-mac-x64", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") @@ -277,8 +277,8 @@ js_library( http_archive( name = "linux_beta_chrome", - url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.31/linux64/chrome-linux64.zip", - sha256 = "57d134da4644831f9b28a30743dd6bd2e10c9f474b1a6149f3389afcf7852131", + url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/linux64/chrome-linux64.zip", + sha256 = "b157ec8a2952606724486f9ed0911aa4dec8e3bcbeb1ba722c13f52999a58dff", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") package(default_visibility = ["//visibility:public"]) @@ -298,8 +298,8 @@ js_library( ) http_archive( name = "mac_beta_chrome", - url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.31/mac-x64/chrome-mac-x64.zip", - sha256 = "62211dfb16c5b194a1fced1c7b5fc2f933922bcfcc1309b4ef6338e47ed2dea9", + url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/mac-x64/chrome-mac-x64.zip", + sha256 = "6d5b57ee94e218a4101662e02d0f8086e4711701be7d99a2693ad62809f927fe", strip_prefix = "chrome-mac-x64", patch_cmds = [ "mv 'Google Chrome for Testing.app' Chrome.app", @@ -319,8 +319,8 @@ js_library( ) http_archive( name = "linux_beta_chromedriver", - url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.31/linux64/chromedriver-linux64.zip", - sha256 = "d9cafd0f78fea5809e2ce51ca2a05b3c47d26ff18ea27b47ef23a35ac7075e46", + url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/linux64/chromedriver-linux64.zip", + sha256 = "78c84b8bb6f7671a657ecf25531fa7972c9d4ea753523e11d2f75a0eb14ebff0", strip_prefix = "chromedriver-linux64", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") @@ -337,8 +337,8 @@ js_library( http_archive( name = "mac_beta_chromedriver", - url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.31/mac-x64/chromedriver-mac-x64.zip", - sha256 = "e8918cd9835308e6fdf288a8a6e79f12c0df3fb6ebdb9cc16d1fbee64bae1212", + url = "https://storage.googleapis.com/chrome-for-testing-public/140.0.7339.6/mac-x64/chromedriver-mac-x64.zip", + sha256 = "10dc8f0ea0154261aedb2f1b075bee761f1a26de793085d4f22160cc169e22d4", strip_prefix = "chromedriver-mac-x64", build_file_content = """ load("@aspect_rules_js//js:defs.bzl", "js_library") diff --git a/java/test/org/openqa/selenium/HistoryNavigationTest.java b/java/test/org/openqa/selenium/HistoryNavigationTest.java index 1c6e213dd161a..615ed2a1a0969 100644 --- a/java/test/org/openqa/selenium/HistoryNavigationTest.java +++ b/java/test/org/openqa/selenium/HistoryNavigationTest.java @@ -35,9 +35,9 @@ public class HistoryNavigationTest extends JupiterTestBase { @Test @Ignore(value = SAFARI, reason = "Hanging") public void testShouldDoNothingIfThereIsNothingToGoBackTo() { - ((JavascriptExecutor) driver) - .executeScript("window.open(arguments[0], 'newWindow')", pages.formPage); + ((JavascriptExecutor) driver).executeScript("window.open('', 'newWindow')"); wait.until(windowToBeSwitchedToWithName("newWindow")); + driver.get(pages.formPage); wait.until(titleIs("We Leave From Here")); String originalTitle = driver.getTitle(); driver.get(pages.blankPage); diff --git a/py/test/selenium/webdriver/common/w3c_interaction_tests.py b/py/test/selenium/webdriver/common/w3c_interaction_tests.py index 32715fab22da9..a234a0f93be36 100644 --- a/py/test/selenium/webdriver/common/w3c_interaction_tests.py +++ b/py/test/selenium/webdriver/common/w3c_interaction_tests.py @@ -198,28 +198,33 @@ def test_pen_pointer_properties(driver, pages): ).pointer_up().move_to(pointerArea, x=5, y=10) actions.perform() events = _get_events(driver) - assert events[3]["type"] == "pointerdown" - assert events[3]["pageX"] == pytest.approx(center["x"], abs=1.0) - assert events[3]["pageY"] == pytest.approx(center["y"], abs=1.0) - assert events[3]["target"] == "pointerArea" - assert events[3]["pointerType"] == "pen" - # The default value of width and height for mouse and pen inputs is 1 - assert round(events[3]["width"], 2) == 1 - assert round(events[3]["height"], 2) == 1 - assert round(events[3]["pressure"], 2) == 0.36 - assert events[3]["tiltX"] == -72 - assert events[3]["tiltY"] == 9 - assert events[3]["twist"] == 86 - assert events[6]["type"] == "pointermove" - assert events[6]["target"] == "pointerArea" - assert events[6]["pointerType"] == "pen" - assert round(events[6]["width"], 2) == 1 - assert round(events[6]["height"], 2) == 1 - # The default value of pressure for all inputs is 0.5, other properties are 0 - assert round(events[6]["pressure"], 2) == 0.5 - assert events[6]["tiltX"] == 0 - assert events[6]["tiltY"] == 0 - assert events[6]["twist"] == 0 + + # Find the first pointerdown and pointermove events for pen + pen_events = [e for e in events if e["pointerType"] == "pen"] + pointerdown_event = next((e for e in pen_events if e["type"] == "pointerdown"), None) + pointermove_event = next((e for e in pen_events if e["type"] == "pointermove" and e.get("buttons", 0) == 1), None) + + assert pointerdown_event is not None, "No pointerdown event found for pen" + assert pointerdown_event["pageX"] == pytest.approx(center["x"], abs=1.0) + assert pointerdown_event["pageY"] == pytest.approx(center["y"], abs=1.0) + assert pointerdown_event["target"] == "pointerArea" + assert pointerdown_event["pointerType"] == "pen" + assert round(pointerdown_event["width"], 2) == 1 + assert round(pointerdown_event["height"], 2) == 1 + assert round(pointerdown_event["pressure"], 2) == 0.36 + assert pointerdown_event["tiltX"] == -72 + assert pointerdown_event["tiltY"] == 9 + assert pointerdown_event["twist"] == 86 + + assert pointermove_event is not None, "No pointermove event found for pen with buttons == 1" + assert pointermove_event["target"] == "pointerArea" + assert pointermove_event["pointerType"] == "pen" + assert round(pointermove_event["width"], 2) == 1 + assert round(pointermove_event["height"], 2) == 1 + assert round(pointermove_event["pressure"], 2) == 0.5 + assert pointermove_event["tiltX"] == 0 + assert pointermove_event["tiltY"] == 0 + assert pointermove_event["twist"] == 0 @pytest.mark.xfail_firefox