Merge branch 'SeleniumHQ:trunk' into py-fix-error-handler

Author: cgoldberg

MODULE.bazel

@@ -370,13 +370,17 @@ use_repo(
 pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension")
 use_repo(
     pin_browsers_extension,
+    "linux_beta_chrome",
+    "linux_beta_chromedriver",
     "linux_beta_firefox",
     "linux_chrome",
     "linux_chromedriver",
     "linux_edge",
     "linux_edgedriver",
     "linux_firefox",
     "linux_geckodriver",
+    "mac_beta_chrome",
+    "mac_beta_chromedriver",
     "mac_beta_firefox",
     "mac_chrome",
     "mac_chromedriver",

common/browsers.bzl

@@ -83,3 +83,25 @@ firefox_beta_data = select({
     ],
     "//conditions:default": [],
 }) + geckodriver_data
+
+chromedriver_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
+    "//conditions:default": [],
+})
+
+chrome_beta_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "@linux_beta_chrome//:files",
+        "@linux_beta_chrome//:chrome-linux64/chrome",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_beta_chrome//:Chrome.app",
+    ],
+    "//conditions:default": [],
+}) + chromedriver_beta_data

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b7/linux-x86_64/en-US/firefox-140.0b7.tar.xz",
-        sha256 = "a6e232e676e9b1490d673745da8221614e7cab68ed73003e41d6a07d91062af8",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b8/linux-x86_64/en-US/firefox-140.0b8.tar.xz",
+        sha256 = "1fa8bcb1e242ffbad091b3ee7067ece582d34508db394e656832ab07b058e96e",
         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/140.0b7/mac/en-US/Firefox%20140.0b7.dmg",
-        sha256 = "24a756a979ef4c23e223002e8cb748ad69236f023f0ba0168d98add4f5d0cb8e",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/140.0b8/mac/en-US/Firefox%20140.0b8.dmg",
+        sha256 = "7e648f5e0305a6abedb698ea5b29971cd1eb58225b998baa85a82d94bcf75342",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -218,7 +218,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "mac_chrome",
         url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/mac-x64/chrome-mac-x64.zip",
@@ -240,7 +239,6 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "linux_chromedriver",
         url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/linux64/chromedriver-linux64.zip",
@@ -270,6 +268,84 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files(["chromedriver"])
 
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "linux_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/linux64/chrome-linux64.zip",
+        sha256 = "e4bb8769b613eacd7cc40e48f3f63d96de9e9ee642360b4a79bedd502291c544",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "files",
+    srcs = glob(["**/*"]),
+)
+
+exports_files(["chrome-linux64/chrome"])
+
+js_library(
+    name = "chrome-js",
+    data = [":files"],
+)
+""",
+    )
+    http_archive(
+        name = "mac_beta_chrome",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/mac-x64/chrome-mac-x64.zip",
+        sha256 = "46dbfe39930cd3a2a45bc85a70bb49c291c258fde5be4d3d4deecc8e3181ae2f",
+        strip_prefix = "chrome-mac-x64",
+        patch_cmds = [
+            "mv 'Google Chrome for Testing.app' Chrome.app",
+            "mv 'Chrome.app/Contents/MacOS/Google Chrome for Testing' Chrome.app/Contents/MacOS/Chrome",
+        ],
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["Chrome.app"])
+
+js_library(
+    name = "chrome-js",
+    data = glob(["Chrome.app/**/*"]),
+)
+""",
+    )
+    http_archive(
+        name = "linux_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/linux64/chromedriver-linux64.zip",
+        sha256 = "b180e7569aa10a10e5b112b2b6cc21d126499122eaba0e90d264713285cc9104",
+        strip_prefix = "chromedriver-linux64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
+js_library(
+    name = "chromedriver-js",
+    data = ["chromedriver"],
+)
+""",
+    )
+
+    http_archive(
+        name = "mac_beta_chromedriver",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/138.0.7204.15/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "fda50dbab46115e2185cae0f3eeb8526c3f95175b0d4f7f7871aaf1e63590d5c",
+        strip_prefix = "chromedriver-mac-x64",
+        build_file_content = """
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+package(default_visibility = ["//visibility:public"])
+
+exports_files(["chromedriver"])
+
 js_library(
     name = "chromedriver-js",
     data = ["chromedriver"],

py/selenium/webdriver/common/bidi/browsing_context.py

@@ -335,9 +335,11 @@ class HistoryUpdatedParams:
     def __init__(
         self,
         context: str,
+        timestamp: int,
         url: str,
     ):
         self.context = context
+        self.timestamp = timestamp
         self.url = url
 
     @classmethod
@@ -356,12 +358,17 @@ def from_json(cls, json: dict) -> "HistoryUpdatedParams":
         if context is None or not isinstance(context, str):
             raise ValueError("context is required and must be a string")
 
+        timestamp = json.get("timestamp")
+        if timestamp is None or not isinstance(timestamp, int) or timestamp < 0:
+            raise ValueError("timestamp is required and must be a non-negative integer")
+
         url = json.get("url")
         if url is None or not isinstance(url, str):
             raise ValueError("url is required and must be a string")
 
         return cls(
             context=context,
+            timestamp=timestamp,
             url=url,
         )
 

py/selenium/webdriver/remote/server.py

@@ -57,49 +57,73 @@ def __init__(self, host=None, port=4444, path=None, version=None, log_level="INF
             raise TypeError("Not allowed to specify a version when using an existing server path")
 
         self.host = host
-        self.port = self._validate_port(port)
-        self.path = self._validate_path(path)
-        self.version = self._validate_version(version)
-        self.log_level = self._validate_log_level(log_level)
-        self.env = self._validate_env(env)
-
+        self.port = port
+        self.path = path
+        self.version = version
+        self.log_level = log_level
+        self.env = env
         self.process = None
-        self.status_url = self._get_status_url()
 
-    def _get_status_url(self):
+    @property
+    def status_url(self):
         host = self.host if self.host is not None else "localhost"
         return f"http://{host}:{self.port}/status"
 
-    def _validate_path(self, path):
+    @property
+    def path(self):
+        return self._path
+
+    @path.setter
+    def path(self, path):
         if path and not os.path.exists(path):
             raise OSError(f"Can't find server .jar located at {path}")
-        return path
+        self._path = path
+
+    @property
+    def port(self):
+        return self._port
 
-    def _validate_port(self, port):
+    @port.setter
+    def port(self, port):
         try:
             port = int(port)
         except ValueError:
             raise TypeError(f"{__class__.__name__}.__init__() got an invalid port: '{port}'")
         if not (0 <= port <= 65535):
             raise ValueError("port must be 0-65535")
-        return port
+        self._port = port
 
-    def _validate_version(self, version):
+    @property
+    def version(self):
+        return self._version
+
+    @version.setter
+    def version(self, version):
         if version:
             if not re.match(r"^\d+\.\d+\.\d+$", str(version)):
                 raise TypeError(f"{__class__.__name__}.__init__() got an invalid version: '{version}'")
-        return version
+        self._version = version
+
+    @property
+    def log_level(self):
+        return self._log_level
 
-    def _validate_log_level(self, log_level):
+    @log_level.setter
+    def log_level(self, log_level):
         levels = ("SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", "FINEST")
         if log_level not in levels:
             raise TypeError(f"log_level must be one of: {', '.join(levels)}")
-        return log_level
+        self._log_level = log_level
+
+    @property
+    def env(self):
+        return self._env
 
-    def _validate_env(self, env):
+    @env.setter
+    def env(self, env):
         if env is not None and not isinstance(env, collections.abc.Mapping):
             raise TypeError("env must be a mapping of environment variables")
-        return env
+        self._env = env
 
     def _wait_for_server(self, timeout=10):
         start = time.time()

py/selenium/webdriver/support/expected_conditions.py

@@ -428,6 +428,8 @@ def text_to_be_present_in_element_value(
     def _predicate(driver: WebDriverOrWebElement):
         try:
             element_text = driver.find_element(*locator).get_attribute("value")
+            if element_text is None:
+                return False
             return text_ in element_text
         except StaleElementReferenceException:
             return False

rb/lib/selenium/webdriver/common/child_process.rb

@@ -122,10 +122,14 @@ def terminate_and_wait_else_kill(timeout)
 
       def terminate(pid)
         Process.kill(SIGTERM, pid)
+      rescue Errno::ECHILD, Errno::ESRCH
+        # Process does not exist, nothing to terminate
       end
 
       def kill(pid)
         Process.kill(SIGKILL, pid)
+      rescue Errno::ECHILD, Errno::ESRCH
+        # Process does not exist, nothing to kill
       end
 
       def waitpid2(pid, flags = 0)

rb/spec/integration/BUILD.bazel

@@ -2,6 +2,7 @@ package(default_visibility = ["//rb/spec/integration:__subpackages__"])
 
 BROWSERS = [
     "chrome",
+    "chrome-beta",
     "edge",
     "firefox",
     "ie",

rb/spec/integration/selenium/webdriver/chrome/BUILD.bazel

@@ -4,7 +4,12 @@ load("//rb/spec:tests.bzl", "rb_integration_test")
     rb_integration_test(
         name = file[:-8],
         srcs = [file],
-        browsers = ["chrome"],  # No need to run in other browsers.
+        # No need to run in other browsers.
+        browsers = [
+            "chrome",
+            "chrome-beta",
+        ],
+        data = ["//common/extensions"],
     )
     for file in glob(["*_spec.rb"])
 ]

rb/spec/tests.bzl

@@ -2,6 +2,7 @@ load("@rules_ruby//ruby:defs.bzl", "rb_library", "rb_test")
 load(
     "//common:browsers.bzl",
     "COMMON_TAGS",
+    "chrome_beta_data",
     "chrome_data",
     "edge_data",
     "firefox_beta_data",
@@ -32,6 +33,30 @@ BROWSERS = {
             "//conditions:default": {},
         }),
     },
+    "chrome-beta": {
+        "data": chrome_beta_data,
+        "deps": ["//rb/lib/selenium/webdriver:chrome"],
+        "tags": [],
+        "target_compatible_with": [],
+        "env": {
+            "WD_REMOTE_BROWSER": "chrome",
+            "WD_SPEC_DRIVER": "chrome",
+            "WD_BROWSER_VERSION": "beta",
+        } | select({
+            "@selenium//common:use_pinned_linux_chrome": {
+                "CHROME_BINARY": "$(location @linux_beta_chrome//:chrome-linux64/chrome)",
+                "CHROMEDRIVER_BINARY": "$(location @linux_beta_chromedriver//:chromedriver)",
+            },
+            "@selenium//common:use_pinned_macos_chrome": {
+                "CHROME_BINARY": "$(location @mac_beta_chrome//:Chrome.app)/Contents/MacOS/Chrome",
+                "CHROMEDRIVER_BINARY": "$(location @mac_beta_chromedriver//:chromedriver)",
+            },
+            "//conditions:default": {},
+        }) | select({
+            "@selenium//common:use_headless_browser": {"HEADLESS": "true"},
+            "//conditions:default": {},
+        }),
+    },
     "edge": {
         "data": edge_data,
         "deps": ["//rb/lib/selenium/webdriver:edge"],