Merge branch 'trunk' into server

Author: cgoldberg

.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
 

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.0b4/linux-x86_64/en-US/firefox-140.0b4.tar.xz",
-        sha256 = "40820674c78e05b1413458c2844e874c8521670780fdb4489e62379a42fba704",
+        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.0b4/mac/en-US/Firefox%20140.0b4.dmg",
-        sha256 = "dce036c33d4749910cc2d87ce4c6786f7538a83dfe22f1ae1f9bfd17d4a23523",
+        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"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/1b7ce123-70b7-486d-a381-9e418df1feb8/MicrosoftEdge-137.0.3296.62.pkg",
-        sha256 = "e2c537663569fc81ff14f3278495e071e7b1e5d8c759b7bcf17f7d807403f957",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/881a4aef-792c-4d81-a76f-3cf546510d68/MicrosoftEdge-137.0.3296.68.pkg",
+        sha256 = "4de62ee93ba67db666597807fc991e749f073af07a577dfdfc56dbf19409c87d",
         move = {
-            "MicrosoftEdge-137.0.3296.62.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-137.0.3296.68.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_137.0.3296.62-1_amd64.deb",
-        sha256 = "f5f1e57029fb8f85baa5441e9a45aeeb7aa6a6f3759d3c458c1b15297ed115bc",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_137.0.3296.68-1_amd64.deb",
+        sha256 = "76099017ace977c74060aa134a289d93c554e9d67f6561039580fdd483da0c41",
         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.azureedge.net/137.0.3296.58/edgedriver_linux64.zip",
-        sha256 = "5e6872dcd8736b4fd208bfe18ae29d87dbda1f293932e0ae523c0f9449b98c18",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.68/edgedriver_linux64.zip",
+        sha256 = "0605ae9e651befd470826ff3c3baf74b3d40599c25f1edd60b09d10f5b97144a",
         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.azureedge.net/137.0.3296.58/edgedriver_mac64.zip",
-        sha256 = "4dcc5e8537c49746ed1f35bf105946f25a2f0daf7eda68018b0360ae4ec33071",
+        url = "https://msedgedriver.azureedge.net/137.0.3296.68/edgedriver_mac64.zip",
+        sha256 = "29b331d365361f0e9ef68c2e573f33ca895b3fa607823a66de9d6f226dbe4a54",
         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"])
@@ -221,8 +221,8 @@ 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",
@@ -243,8 +243,8 @@ 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 +261,8 @@ 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")

java/src/org/openqa/selenium/HasDownloads.java

@@ -33,13 +33,23 @@ public interface HasDownloads {
    * @throws WebDriverException if capability to enable downloads is not set
    */
   default void requireDownloadsEnabled(Capabilities capabilities) {
-    boolean downloadsEnabled = capabilities.is("se:downloadsEnabled");
-    if (!downloadsEnabled) {
+    if (!isDownloadsEnabled(capabilities)) {
       throw new WebDriverException(
           "You must enable downloads in order to work with downloadable files.");
     }
   }
 
+  /**
+   * Checks if downloads are enabled
+   *
+   * @return true if this webdriver has capability "se:downloadsEnabled" = true
+   */
+  boolean isDownloadsEnabled();
+
+  static boolean isDownloadsEnabled(Capabilities capabilities) {
+    return capabilities.is("se:downloadsEnabled");
+  }
+
   /**
    * Gets the downloadable files.
    *

java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java

@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.grid.data;
 
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
+
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
@@ -129,13 +131,13 @@ private Boolean initialMatch(Capabilities stereotype, Capabilities capabilities)
 
   private Boolean managedDownloadsEnabled(Capabilities stereotype, Capabilities capabilities) {
     // First lets check if user wanted a Node with managed downloads enabled
-    Object raw = capabilities.getCapability("se:downloadsEnabled");
+    Object raw = capabilities.getCapability(ENABLE_DOWNLOADS);
     if (raw == null || !Boolean.parseBoolean(raw.toString())) {
       // User didn't ask. So lets move on to the next matching criteria
       return true;
     }
     // User wants managed downloads enabled to be done on this Node, let's check the stereotype
-    raw = stereotype.getCapability("se:downloadsEnabled");
+    raw = stereotype.getCapability(ENABLE_DOWNLOADS);
     // Try to match what the user requested
     return raw != null && Boolean.parseBoolean(raw.toString());
   }

java/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.grid.node.config;
 
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
@@ -749,8 +751,7 @@ public Capabilities enhanceStereotype(Capabilities capabilities) {
               .setCapability("se:noVncPort", noVncPort());
     }
     if (isManagedDownloadsEnabled() && canConfigureDownloadsDir(capabilities)) {
-      capabilities =
-          new PersistentCapabilities(capabilities).setCapability("se:downloadsEnabled", true);
+      capabilities = new PersistentCapabilities(capabilities).setCapability(ENABLE_DOWNLOADS, true);
     }
     return capabilities;
   }

java/src/org/openqa/selenium/grid/node/local/LocalNode.java

@@ -23,6 +23,7 @@
 import static org.openqa.selenium.grid.data.Availability.DRAINING;
 import static org.openqa.selenium.grid.data.Availability.UP;
 import static org.openqa.selenium.grid.node.CapabilityResponseEncoder.getEncoder;
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
 import static org.openqa.selenium.remote.HttpSessionId.getSessionId;
 import static org.openqa.selenium.remote.RemoteTags.CAPABILITIES;
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID;
@@ -575,7 +576,7 @@ public Either<WebDriverException, CreateSessionResponse> newSession(
   }
 
   private boolean managedDownloadsRequested(Capabilities capabilities) {
-    Object downloadsEnabled = capabilities.getCapability("se:downloadsEnabled");
+    Object downloadsEnabled = capabilities.getCapability(ENABLE_DOWNLOADS);
     return managedDownloadsEnabled
         && downloadsEnabled != null
         && Boolean.parseBoolean(downloadsEnabled.toString());

java/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -649,6 +649,11 @@ public void removeVirtualAuthenticator(VirtualAuthenticator authenticator) {
         Map.of("authenticatorId", authenticator.getId()));
   }
 
+  @Override
+  public boolean isDownloadsEnabled() {
+    return HasDownloads.isDownloadsEnabled(capabilities);
+  }
+
   /**
    * Retrieves the names of the downloadable files.
    *

java/test/org/openqa/selenium/chrome/ChromeOptionsTest.java

@@ -27,6 +27,7 @@
 import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.OFF;
 import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.SEVERE;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
 import static org.openqa.selenium.remote.CapabilityType.TIMEOUTS;
 
 import java.io.File;
@@ -98,7 +99,7 @@ void canAddW3CCompliantOptions() {
     assertThat(mappedOptions.get("acceptInsecureCerts")).isEqualTo(true);
     assertThat(mappedOptions.get("pageLoadStrategy")).hasToString("eager");
     assertThat(mappedOptions.get("strictFileInteractability")).isEqualTo(true);
-    assertThat(mappedOptions.get("se:downloadsEnabled")).isEqualTo(true);
+    assertThat(mappedOptions.get(ENABLE_DOWNLOADS)).isEqualTo(true);
 
     Map<String, Long> expectedTimeouts = new HashMap<>();
     expectedTimeouts.put("implicit", 1000L);
@@ -239,7 +240,8 @@ void mergingOptionsWithMutableCapabilities() {
 
     MutableCapabilities one = new MutableCapabilities();
 
-    ChromeOptions options = new ChromeOptions();
+    org.openqa.selenium.chrome.ChromeOptions options =
+        new org.openqa.selenium.chrome.ChromeOptions();
     options.addArguments("verbose");
     options.addArguments("silent");
     options.setExperimentalOption("opt1", "val1");

java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.grid.data;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
 
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Capabilities;
@@ -198,15 +199,15 @@ void fullMatchExtensionCaps() {
             "firefox",
             CapabilityType.PLATFORM_NAME,
             Platform.WINDOWS,
-            "se:downloadsEnabled",
+            ENABLE_DOWNLOADS,
             true);
     Capabilities capabilities =
         new ImmutableCapabilities(
             CapabilityType.BROWSER_NAME,
             "firefox",
             CapabilityType.PLATFORM_NAME,
             Platform.WINDOWS,
-            "se:downloadsEnabled",
+            ENABLE_DOWNLOADS,
             true);
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
@@ -307,29 +308,25 @@ void matchesBrowser() {
   @Test
   void matchDownloadsForRegularTestMatchingAgainstADownloadAwareNode() {
     Capabilities stereotype =
-        new ImmutableCapabilities(
-            CapabilityType.BROWSER_NAME, "chrome", "se:downloadsEnabled", true);
+        new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome", ENABLE_DOWNLOADS, true);
     Capabilities capabilities = new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome");
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
 
   @Test
   void matchDownloadsForAutoDownloadTestMatchingAgainstADownloadAwareNode() {
     Capabilities stereotype =
-        new ImmutableCapabilities(
-            CapabilityType.BROWSER_NAME, "chrome", "se:downloadsEnabled", true);
+        new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome", ENABLE_DOWNLOADS, true);
     Capabilities capabilities =
-        new ImmutableCapabilities(
-            CapabilityType.BROWSER_NAME, "chrome", "se:downloadsEnabled", true);
+        new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome", ENABLE_DOWNLOADS, true);
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
 
   @Test
   void ensureNoMatchFOrDownloadAwareTestMatchingAgainstOrdinaryNode() {
     Capabilities stereotype = new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome");
     Capabilities capabilities =
-        new ImmutableCapabilities(
-            CapabilityType.BROWSER_NAME, "chrome", "se:downloadsEnabled", true);
+        new ImmutableCapabilities(CapabilityType.BROWSER_NAME, "chrome", ENABLE_DOWNLOADS, true);
     assertThat(slotMatcher.matches(stereotype, capabilities)).isFalse();
   }
 

java/test/org/openqa/selenium/grid/node/NodeTest.java

@@ -24,6 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
+import static org.openqa.selenium.remote.CapabilityType.ENABLE_DOWNLOADS;
 import static org.openqa.selenium.remote.http.Contents.string;
 import static org.openqa.selenium.remote.http.HttpMethod.DELETE;
 import static org.openqa.selenium.remote.http.HttpMethod.GET;
@@ -124,8 +125,8 @@ public void setUp(TestInfo testInfo) throws URISyntaxException {
     stereotype = new ImmutableCapabilities("browserName", "cheese");
     caps = new ImmutableCapabilities("browserName", "cheese");
     if (isDownloadsTestCase) {
-      stereotype = new ImmutableCapabilities("browserName", "chrome", "se:downloadsEnabled", true);
-      caps = new ImmutableCapabilities("browserName", "chrome", "se:downloadsEnabled", true);
+      stereotype = new ImmutableCapabilities("browserName", "chrome", ENABLE_DOWNLOADS, true);
+      caps = new ImmutableCapabilities("browserName", "chrome", ENABLE_DOWNLOADS, true);
     }
 
     uri = new URI("http://localhost:1234");