Merge branch 'trunk' into feat/pretty-properties-docstrings

Author: cgoldberg

common/mirror/selenium

@@ -1,35 +1,35 @@
 [
   {
-    "tag_name": "selenium-4.38.0",
+    "tag_name": "nightly",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-dotnet-4.38.0.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-dotnet-strongnamed-4.38.0.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-java-4.38.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.39.0-SNAPSHOT.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-server-4.38.0.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.39.0-SNAPSHOT.jar"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-server-4.38.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.39.0-SNAPSHOT.zip"
       }
     ]
   },
   {
-    "tag_name": "nightly",
+    "tag_name": "selenium-4.38.0",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.39.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-dotnet-4.38.0.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.39.0-SNAPSHOT.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-dotnet-strongnamed-4.38.0.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.39.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-java-4.38.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-server-4.38.0.jar"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-server-4.38.0.zip"
       }
     ]
   },

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b5/linux-x86_64/en-US/firefox-145.0b5.tar.xz",
-        sha256 = "3724a4f868c94be4ac82ce7f0437523c6ca5f52aa7a5b9aad1fba66775cfce6c",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b6/linux-x86_64/en-US/firefox-145.0b6.tar.xz",
+        sha256 = "661732f5dc7b3068b73cd28b38db094cf60f77d233ce6949ce604beffce20856",
         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/145.0b5/mac/en-US/Firefox%20145.0b5.dmg",
-        sha256 = "f1cc4967d8e58f1ea746420a6a3946af3f2585843573539ff285c521597a465f",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b6/mac/en-US/Firefox%20145.0b6.dmg",
+        sha256 = "cbd701f0312cd6893577dfaae03c150eb83232deb952780e4b16dbe912bfba5d",
         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/141.0.3537.92/edgedriver_linux64.zip",
-        sha256 = "fe50eb46a2524798705743b49059bb587d072e7544e49d10c5c1adce2c3d8d5e",
+        url = "https://msedgedriver.microsoft.com/141.0.3537.99/edgedriver_linux64.zip",
+        sha256 = "92b75bd04d1c52df4762f78c3c4559d5592d621f2e67cbb828744f846650f956",
         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/141.0.3537.92/edgedriver_mac64.zip",
-        sha256 = "a0feeb73db2fa8f7b256eebaf4f97aa3fd6b40ed14ffd3f605d8f7605d262e07",
+        url = "https://msedgedriver.microsoft.com/141.0.3537.99/edgedriver_mac64.zip",
+        sha256 = "06ffd6cd08355676d7624dc2445afa447c668d549a1fafb037f43f62184c9bb0",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

py/selenium/webdriver/common/bidi/emulation.py

@@ -245,3 +245,37 @@ def set_timezone_override(
             params["userContexts"] = user_contexts
 
         self.conn.execute(command_builder("emulation.setTimezoneOverride", params))
+
+    def set_locale_override(
+        self,
+        locale: Optional[str] = None,
+        contexts: Optional[list[str]] = None,
+        user_contexts: Optional[list[str]] = None,
+    ) -> None:
+        """Set locale override for the given contexts or user contexts.
+
+        Parameters:
+        -----------
+            locale: Locale string as per BCP 47, or None to clear override.
+            contexts: List of browsing context IDs to apply the override to.
+            user_contexts: List of user context IDs to apply the override to.
+
+        Raises:
+        ------
+            ValueError: If both contexts and user_contexts are provided, or if neither
+                       contexts nor user_contexts are provided, or if locale is invalid.
+        """
+        if contexts is not None and user_contexts is not None:
+            raise ValueError("Cannot specify both contexts and userContexts")
+
+        if contexts is None and user_contexts is None:
+            raise ValueError("Must specify either contexts or userContexts")
+
+        params: dict[str, Any] = {"locale": locale}
+
+        if contexts is not None:
+            params["contexts"] = contexts
+        elif user_contexts is not None:
+            params["userContexts"] = user_contexts
+
+        self.conn.execute(command_builder("emulation.setLocaleOverride", params))

py/test/selenium/webdriver/common/bidi_emulation_tests.py

@@ -64,6 +64,15 @@ def get_browser_geolocation(driver, user_context=None):
     """)
 
 
+def get_browser_locale(driver):
+    result = driver.script._evaluate(
+        "Intl.DateTimeFormat().resolvedOptions().locale",
+        {"context": driver.current_window_handle},
+        await_promise=False,
+    )
+    return result.result["value"]
+
+
 def test_emulation_initialized(driver):
     """Test that the emulation module is initialized properly."""
     assert driver.emulation is not None
@@ -293,3 +302,63 @@ def test_set_timezone_override_using_offset(driver, pages):
     assert timezone_string == "+05:30", f"Expected timezone '+05:30', got: {timezone_string}"
 
     driver.emulation.set_timezone_override(timezone=None, contexts=[context_id])
+
+
+@pytest.mark.parametrize(
+    "locale,expected_locale",
+    [
+        # Locale with Unicode extension keyword for collation.
+        ("de-DE-u-co-phonebk", "de-DE"),
+        # Lowercase language and region.
+        ("fr-ca", "fr-CA"),
+        # Uppercase language and region (should be normalized by Intl.Locale).
+        ("FR-CA", "fr-CA"),
+        # Mixed case language and region (should be normalized by Intl.Locale).
+        ("fR-cA", "fr-CA"),
+        # Locale with transform extension (simple case).
+        ("en-t-zh", "en"),
+    ],
+)
+def test_set_locale_override_with_contexts(driver, pages, locale, expected_locale):
+    """Test setting locale override with browsing contexts."""
+    context_id = driver.current_window_handle
+
+    driver.emulation.set_locale_override(locale=locale, contexts=[context_id])
+
+    driver.browsing_context.navigate(context_id, pages.url("formPage.html"), wait="complete")
+
+    current_locale = get_browser_locale(driver)
+    assert current_locale == expected_locale, f"Expected locale {expected_locale}, got {current_locale}"
+
+
+@pytest.mark.parametrize(
+    "value",
+    [
+        # Simple language code (2-letter).
+        "en",
+        # Language and region (both 2-letter).
+        "en-US",
+        # Language and script (4-letter).
+        "sr-Latn",
+        # Language, script, and region.
+        "zh-Hans-CN",
+    ],
+)
+def test_set_locale_override_with_user_contexts(driver, pages, value):
+    """Test setting locale override with user contexts."""
+    user_context = driver.browser.create_user_context()
+    try:
+        context_id = driver.browsing_context.create(type=WindowTypes.TAB, user_context=user_context)
+        try:
+            driver.switch_to.window(context_id)
+
+            driver.emulation.set_locale_override(locale=value, user_contexts=[user_context])
+
+            driver.browsing_context.navigate(context_id, pages.url("formPage.html"), wait="complete")
+
+            current_locale = get_browser_locale(driver)
+            assert current_locale == value, f"Expected locale {value}, got {current_locale}"
+        finally:
+            driver.browsing_context.close(context_id)
+    finally:
+        driver.browser.remove_user_context(user_context)