Merge branch 'trunk' into java_bidi_history_updated

Author: Delta456

.github/workflows/ci-python.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install tox==4.25.0
-      - name: Test with tox
+      - name: Generate docs
         run: tox -c py/tox.ini
         env:
           TOXENV: docs
@@ -48,10 +48,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install tox==4.25.0
-      - name: Test with tox
+      - name: Run type checking
         run: |
-          tox -c py/tox.ini -- --cobertura-xml-report ci || true
-          bash <(curl -s https://codecov.io/bash) -f py/ci/cobertura.xml
+          tox -c py/tox.ini || true
         env:
           TOXENV: mypy
 

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

@@ -11,8 +11,8 @@ def pin_browsers():
 
     http_archive(
         name = "linux_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.1/linux-x86_64/en-US/firefox-139.0.1.tar.xz",
-        sha256 = "f1a264f61d41700e8fcfa2310478d0c909655399a413072664fddaf612b53c07",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.4/linux-x86_64/en-US/firefox-139.0.4.tar.xz",
+        sha256 = "fe22686f09a0c46390fea430b26cccc323d92af26869699f394f25b5e71527a3",
         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/139.0.1/mac/en-US/Firefox%20139.0.1.dmg",
-        sha256 = "243478e2a2fd5d9dd0cc261c812b0146e433d703fec960c27c7284b2de7e65bc",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/139.0.4/mac/en-US/Firefox%20139.0.4.dmg",
+        sha256 = "fc058bf34094828c0919ad81672d697cf01dfa291ba9b11e0b1c119588878405",
         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/140.0b6/linux-x86_64/en-US/firefox-140.0b6.tar.xz",
-        sha256 = "ae3fc88078ea41f85a24ab6c4f865b476ceebef4c3a2117e02607c7afdc191a8",
+        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.0b6/mac/en-US/Firefox%20140.0b6.dmg",
-        sha256 = "cd0326af92ca17e5121c916edfe10e913ec39d8ccd16c079207effa7d4aaab75",
+        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"])
@@ -199,8 +199,8 @@ js_library(
 
     http_archive(
         name = "linux_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/linux64/chrome-linux64.zip",
-        sha256 = "5e92980724bb8577964d6914a6faa8021ff9b640944673e9b5fcb6eccfc16c8e",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/linux64/chrome-linux64.zip",
+        sha256 = "da1424d975dbe963b0a7f7f8e8c2e477bfed6b3430a2bc0b287f1c247ec62ee3",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -218,11 +218,10 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "mac_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/mac-x64/chrome-mac-x64.zip",
-        sha256 = "d15327182bee2493286f5f0c526ab6efb7888944d6714ffba5b67997e6c1af93",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/mac-x64/chrome-mac-x64.zip",
+        sha256 = "2ea79a9457dbaffae6fbdf592c93776ac859dca98b448f7513cdd68234454a07",
         strip_prefix = "chrome-mac-x64",
         patch_cmds = [
             "mv 'Google Chrome for Testing.app' Chrome.app",
@@ -240,11 +239,10 @@ js_library(
 )
 """,
     )
-
     http_archive(
         name = "linux_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/linux64/chromedriver-linux64.zip",
-        sha256 = "05e356b3dd497a26f5e3412c67b59976853458f1b3aa5b2b9f606cecdf922586",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/linux64/chromedriver-linux64.zip",
+        sha256 = "cade69e8d67f4951049e56d796111755e0bf9240d26378975a95c8423bb3f55a",
         strip_prefix = "chromedriver-linux64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +259,86 @@ js_library(
 
     http_archive(
         name = "mac_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.68/mac-x64/chromedriver-mac-x64.zip",
-        sha256 = "f369406a48ca98edfc1845e3900be039ab4c93deabe941288514bb402631a5c1",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/137.0.7151.70/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "d80825e87543d99ad7a8b9356fb236ddb7df3ba087f8f314991195da27a7ccc3",
+        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"],
+)
+""",
+    )
+
+    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")

java/src/org/openqa/selenium/bidi/browsingcontext/BrowsingContext.java

@@ -148,6 +148,12 @@ public List<BrowsingContextInfo> getTree() {
             "browsingContext.getTree", Map.of("root", id), browsingContextInfoListMapper));
   }
 
+  public List<BrowsingContextInfo> getTree(String root) {
+    return this.bidi.send(
+      new Command<>(
+        "browsingContext.getTree", Map.of("root", root), browsingContextInfoListMapper));
+  }
+
   public List<BrowsingContextInfo> getTree(int maxDepth) {
     return this.bidi.send(
         new Command<>(
@@ -158,6 +164,16 @@ public List<BrowsingContextInfo> getTree(int maxDepth) {
             browsingContextInfoListMapper));
   }
 
+  public List<BrowsingContextInfo> getTree(String root, int maxDepth) {
+    return this.bidi.send(
+      new Command<>(
+        "browsingContext.getTree",
+        Map.of(
+          "root", root,
+          "maxDepth", maxDepth),
+        browsingContextInfoListMapper));
+  }
+
   public List<BrowsingContextInfo> getTopLevelContexts() {
     return this.bidi.send(
         new Command<>("browsingContext.getTree", new HashMap<>(), browsingContextInfoListMapper));

java/src/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInfo.java

@@ -30,6 +30,12 @@ public class BrowsingContextInfo {
 
   private final List<BrowsingContextInfo> children;
 
+  private final String clientWindow;
+
+  private final String originalOpener;
+
+  private final String userContext;
+
   private final String parentBrowsingContext;
 
   public String getId() {
@@ -44,22 +50,40 @@ public List<BrowsingContextInfo> getChildren() {
     return children;
   }
 
+  public String getClientWindow() {
+    return clientWindow;
+  }
+
+  public String getOriginalOpener() {
+    return originalOpener;
+  }
+
+  public String getUserContext() {
+    return userContext;
+  }
+
   public String getParentBrowsingContext() {
     return parentBrowsingContext;
   }
 
   public BrowsingContextInfo(
-      String id, String url, List<BrowsingContextInfo> children, String parentBrowsingContext) {
+    String id, String url, List<BrowsingContextInfo> children, String clientWindow, String originalOpener, String userContext, String parentBrowsingContext) {
     this.id = id;
     this.url = url;
     this.children = children;
+    this.clientWindow = clientWindow;
+    this.originalOpener = originalOpener;
+    this.userContext = userContext;
     this.parentBrowsingContext = parentBrowsingContext;
   }
 
   public static BrowsingContextInfo fromJson(JsonInput input) {
     String id = null;
     String url = null;
     List<BrowsingContextInfo> children = null;
+    String clientWindow = null;
+    String originalOpener = null;
+    String userContext = null;
     String parentBrowsingContext = null;
 
     input.beginObject();
@@ -81,6 +105,18 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
           parentBrowsingContext = input.read(String.class);
           break;
 
+        case "clientWindow":
+          clientWindow = input.read(String.class);
+          break;
+
+        case "originalOpener":
+          originalOpener = input.read(String.class);
+          break;
+
+        case "userContext":
+          userContext = input.read(String.class);
+          break;
+
         default:
           input.skipValue();
           break;
@@ -89,6 +125,6 @@ public static BrowsingContextInfo fromJson(JsonInput input) {
 
     input.endObject();
 
-    return new BrowsingContextInfo(id, url, children, parentBrowsingContext);
+    return new BrowsingContextInfo(id, url, children, clientWindow, originalOpener, userContext, parentBrowsingContext);
   }
 }