Merge branch 'trunk' into bump-prism

Author: diemol

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b1/linux-x86_64/en-US/firefox-145.0b1.tar.xz",
-        sha256 = "f92c1704ab741bd2d663ae3bed8178a8ad00c84b664bef6fe4fdf486d3edaa4d",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b2/linux-x86_64/en-US/firefox-145.0b2.tar.xz",
+        sha256 = "2299c53a2cea673194324c7e696986f0f319f5ac7b0ed0c08ff141b8dd95b2b5",
         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.0b1/mac/en-US/Firefox%20145.0b1.dmg",
-        sha256 = "be24adf3ec50c911b2b1ee5b66e0c42418d981e2c484f4d09db7e7dd29563479",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/145.0b2/mac/en-US/Firefox%20145.0b2.dmg",
+        sha256 = "3f4da534b1f443a83d2c96e91a1ff9d953534054096fe8c8272cda6f614fa74c",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -277,8 +277,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/142.0.7444.23/linux64/chrome-linux64.zip",
-        sha256 = "8cfb9247d87419bd750c68b6f29424ad91474e0ee848c3f3cde04da76fbf9c2e",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/142.0.7444.34/linux64/chrome-linux64.zip",
+        sha256 = "332faacf49d45f6d6c5f50a3407b70e908304e7944d60bc6fd1c0ed11062d9a0",
         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/142.0.7444.23/mac-x64/chrome-mac-x64.zip",
-        sha256 = "2024bc564c4e7e26514b8cb4740d9f3760b2f8545d573c0ba08bd2ed3f6fd85f",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/142.0.7444.34/mac-x64/chrome-mac-x64.zip",
+        sha256 = "3745e1a1eba0287cb1762145a3a6abeefe98579b6de5715215854f92eee26d04",
         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/142.0.7444.23/linux64/chromedriver-linux64.zip",
-        sha256 = "6309f4601340d2a0c8df04e239a4696f1f5427be8e53545a2a321b640be2a0de",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/142.0.7444.34/linux64/chromedriver-linux64.zip",
+        sha256 = "33850b3337bc92c6621e013af03323e0d6ae1e450aa1ff6b5776d47dd4d9b600",
         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/142.0.7444.23/mac-x64/chromedriver-mac-x64.zip",
-        sha256 = "695d4c4d71f31df7ea9d8bfccd19075662212b7fed9f9487fa2fa2aaa790faa6",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/142.0.7444.34/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "840101066642b930b937ba5e8d7506d9a71bbb6a9a45b5a4c11c05d83aace12c",
         strip_prefix = "chromedriver-mac-x64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")

java/src/org/openqa/selenium/bidi/permissions/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//java:defs.bzl", "java_library")
+load("//java:defs.bzl", "artifact", "java_library")
 
 java_library(
     name = "permissions",
@@ -14,4 +14,7 @@ java_library(
         "//java/test/org/openqa/selenium/bidi:__subpackages__",
         "//java/test/org/openqa/selenium/grid:__subpackages__",
     ],
+    deps = [
+        artifact("org.jspecify:jspecify"),
+    ],
 )

java/src/org/openqa/selenium/bidi/permissions/PermissionState.java

@@ -17,6 +17,10 @@
 
 package org.openqa.selenium.bidi.permissions;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
 public enum PermissionState {
   GRANTED("granted"),
   DENIED("denied"),
@@ -33,7 +37,7 @@ public String toString() {
     return state;
   }
 
-  public static PermissionState findByName(String name) {
+  public static @Nullable PermissionState findByName(String name) {
     PermissionState result = null;
     for (PermissionState state : values()) {
       if (state.toString().equalsIgnoreCase(name)) {

java/src/org/openqa/selenium/grid/jmx/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//java:defs.bzl", "java_library")
+load("//java:defs.bzl", "artifact", "java_library")
 
 java_library(
     name = "jmx",
@@ -8,4 +8,7 @@ java_library(
         "//java/src/org/openqa/selenium/grid/session:__pkg__",
         "//java/test/org/openqa/selenium/grid:__subpackages__",
     ],
+    deps = [
+        artifact("org.jspecify:jspecify"),
+    ],
 )

java/src/org/openqa/selenium/grid/jmx/JMXHelper.java

@@ -22,12 +22,15 @@
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
+@NullMarked
 public class JMXHelper {
 
   private static final Logger LOG = Logger.getLogger(JMXHelper.class.getName());
 
-  public MBean register(Object bean) {
+  public @Nullable MBean register(Object bean) {
     MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
     MBean mBean = new MBean(bean);
     try {

py/test/selenium/webdriver/common/webserver.py

@@ -24,6 +24,8 @@
 import re
 import threading
 
+import filetype
+
 try:
     from urllib import request as urllib_request
 except ImportError:
@@ -70,8 +72,20 @@ def _serve_page(self, page_number):
 
     def _serve_file(self, file_path):
         """Serve a file from the HTML root directory."""
-        with open(file_path, encoding="latin-1") as f:
-            return f.read().encode("utf-8")
+        with open(file_path, "rb") as f:
+            content = f.read()
+
+        kind = filetype.guess(content)
+        if kind is not None:
+            return content, kind.mime
+
+        # fallback for text files that filetype can't detect
+        if file_path.endswith(".txt"):
+            return content, "text/plain"
+        elif file_path.endswith(".json"):
+            return content, "application/json"
+        else:
+            return content, "text/html"
 
     def _send_response(self, content_type="text/html"):
         """Send a response."""
@@ -89,8 +103,7 @@ def do_GET(self):
                 self._send_response("text/html")
                 self.wfile.write(html)
             elif os.path.isfile(file_path):
-                content_type = "application/json" if file_path.endswith(".json") else "text/html"
-                content = self._serve_file(file_path)
+                content, content_type = self._serve_file(file_path)
                 self._send_response(content_type)
                 self.wfile.write(content)
             else:

py/test/selenium/webdriver/remote/remote_downloads_tests.py

@@ -28,11 +28,9 @@
 def test_get_downloadable_files(driver, pages):
     _browser_downloads(driver, pages)
     file_names = driver.get_downloadable_files()
-    # TODO: why is Chrome downloading files as .html???
-    # assert "file_1.txt" in file_names
-    # assert "file_2.jpg" in file_names
-    assert any(f in file_names for f in ("file_1.txt", "file_1.htm", "file_1.html"))
-    assert any(f in file_names for f in ("file_2.jpg", "file_2.htm", "file_2.html"))
+
+    assert "file_1.txt" in file_names
+    assert "file_2.jpg" in file_names
     assert type(file_names) is list
 
 
@@ -42,12 +40,8 @@ def test_download_file(driver, pages):
 
     # Get a list of downloadable files and find the txt file
     downloadable_files = driver.get_downloadable_files()
-    # TODO: why is Chrome downloading files as .html???
-    # text_file_name = next((file for file in downloadable_files if file.endswith(".txt")), None)
-    text_file_name = next(
-        (f for f in downloadable_files if all((f.endswith((".txt", ".htm", ".html")), f.startswith("file_1")))), None
-    )
-    assert text_file_name is not None, "Could not find file in downloadable files"
+    text_file_name = next((file for file in downloadable_files if file.endswith(".txt")), None)
+    assert text_file_name is not None, "Could not find a .txt file in downloadable files"
 
     with tempfile.TemporaryDirectory() as target_directory:
         driver.download_file(text_file_name, target_directory)
@@ -69,8 +63,4 @@ def _browser_downloads(driver, pages):
     pages.load("downloads/download.html")
     driver.find_element(By.ID, "file-1").click()
     driver.find_element(By.ID, "file-2").click()
-    # TODO: why is Chrome downloading files as .html???
-    # WebDriverWait(driver, 5).until(lambda d: "file_2.jpg" in d.get_downloadable_files())
-    WebDriverWait(driver, 5).until(
-        lambda d: any(f in d.get_downloadable_files() for f in ("file_2.jpg", "file_2.htm", "file_2.html"))
-    )
+    WebDriverWait(driver, 3).until(lambda d: "file_2.jpg" in d.get_downloadable_files())