Merge branch 'trunk' into use_rbs_trace

Author: aguspe

.github/workflows/ci-python.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: tox -c py/tox.ini
         env:
@@ -47,7 +47,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: tox -c py/tox.ini
         env:
@@ -69,7 +69,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.6.4
+          pip install tox==4.25.0
       - name: Test with tox
         run: |
           tox -c py/tox.ini -- --cobertura-xml-report ci || true

README.md

@@ -231,8 +231,6 @@ To run all of the linting tools:
 ./go py:lint
 ```
 
-You need `tox` installed to run the linting tools (`pip install tox`).
-
 #### Local Installation
 
 To run Python code locally without building/installing the package, you must first install the dependencies:

dotnet/src/webdriver/BiDi/Modules/Network/BytesValue.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using System;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Network;
@@ -27,6 +28,7 @@ namespace OpenQA.Selenium.BiDi.Modules.Network;
 public abstract record BytesValue
 {
     public static implicit operator BytesValue(string value) => new StringBytesValue(value);
+    public static implicit operator BytesValue(byte[] value) => new Base64BytesValue(Convert.ToBase64String(value));
 }
 
 public record StringBytesValue(string Value) : BytesValue;

java/src/org/openqa/selenium/WebDriver.java

@@ -295,26 +295,6 @@ interface Options {
    */
   interface Timeouts {
 
-    /**
-     * @deprecated Use {@link #implicitlyWait(Duration)}
-     *     <p>Specifies the amount of time the driver should wait when searching for an element if
-     *     it is not immediately present.
-     *     <p>When searching for a single element, the driver should poll the page until the element
-     *     has been found, or this timeout expires before throwing a {@link NoSuchElementException}.
-     *     When searching for multiple elements, the driver should poll the page until at least one
-     *     element has been found or this timeout has expired.
-     *     <p>Increasing the implicit wait timeout should be used judiciously as it will have an
-     *     adverse effect on test run time, especially when used with slower location strategies
-     *     like XPath.
-     *     <p>If the timeout is negative, not null, or greater than 2e16 - 1, an error code with
-     *     invalid argument will be returned.
-     * @param time The amount of time to wait.
-     * @param unit The unit of measure for {@code time}.
-     * @return A self reference.
-     */
-    @Deprecated
-    Timeouts implicitlyWait(long time, TimeUnit unit);
-
     /**
      * Specifies the amount of time the driver should wait when searching for an element if it is
      * not immediately present.
@@ -333,9 +313,7 @@ interface Timeouts {
      * @param duration The duration to wait.
      * @return A self reference.
      */
-    default Timeouts implicitlyWait(Duration duration) {
-      return implicitlyWait(duration.toMillis(), TimeUnit.MILLISECONDS);
-    }
+    Timeouts implicitlyWait(Duration duration);
 
     /**
      * Gets the amount of time the driver should wait when searching for an element if it is not

java/src/org/openqa/selenium/chromium/ChromiumDriver.java

@@ -322,7 +322,7 @@ public void launchApp(String id) {
   public Map<String, Object> executeCdpCommand(String commandName, Map<String, Object> parameters) {
     Require.nonNull("Command Name", commandName);
     if (this.cdp == null) {
-      return java.util.Collections.emptyMap();
+      return Map.of();
     }
 
     return cdp.executeCdpCommand(commandName, parameters);
@@ -363,7 +363,7 @@ public Optional<BiDi> maybeGetBiDi() {
   @Override
   public List<Map<String, String>> getCastSinks() {
     if (this.casting == null) {
-      return java.util.Collections.emptyList();
+      return List.of();
     }
 
     return casting.getCastSinks();

java/src/org/openqa/selenium/firefox/Executable.java

@@ -26,7 +26,13 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.internal.Require;
 
-/** Wrapper around Firefox executable. */
+/**
+ * Wrapper around Firefox executable.
+ *
+ * @deprecated Class {@link FirefoxBinary} will be removed in the future. Functionality of this
+ *     class is already covered by Selenium Manager.
+ */
+@Deprecated
 class Executable {
 
   private final File binary;
@@ -57,6 +63,12 @@ public String getVersion() {
     return version;
   }
 
+  /**
+   * @deprecated Use {@link FirefoxOptions#setBinary(Path)} or {@link
+   *     FirefoxOptions#setBinary(String)} instead. Class {@link Executable} will also be removed in
+   *     the future.
+   */
+  @Deprecated
   public FirefoxBinary.Channel getChannel() {
     if (channel == null) {
       loadChannelPref();

java/src/org/openqa/selenium/firefox/FirefoxBinary.java

@@ -48,7 +48,10 @@
 @Deprecated
 public class FirefoxBinary {
 
-  /** Enumerates Firefox channels, according to https://wiki.mozilla.org/RapidRelease */
+  /**
+   * Enumerates Firefox channels, according to <a
+   * href="https://wiki.mozilla.org/RapidRelease">...</a>
+   */
   public enum Channel {
     ESR("esr"),
     RELEASE("release"),

java/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -152,11 +152,23 @@ public FirefoxOptions configureFromEnv() {
   /**
    * Constructs a {@link FirefoxBinary} and returns that to be used, and because of this is only
    * useful when actually starting firefox.
+   *
+   * @deprecated This method is deprecated and will be removed in a future version. Selenium Manager
+   *     handles this for you.
    */
+  @Deprecated
   public FirefoxBinary getBinary() {
     return getBinaryOrNull().orElseGet(FirefoxBinary::new);
   }
 
+  /**
+   * Sets the path to the Firefox binary to use. This is useful when you have multiple versions of
+   * Firefox installed on your machine.
+   *
+   * @deprecated This method is deprecated and will be removed in a future version. Use {@link
+   *     #setBinary(Path)} or {@link #setBinary(String)} instead.
+   */
+  @Deprecated
   public FirefoxOptions setBinary(FirefoxBinary binary) {
     Require.nonNull("Binary", binary);
     addArguments(binary.getExtraOptions());
@@ -173,6 +185,14 @@ public FirefoxOptions setBinary(String path) {
     return setFirefoxOption(Keys.BINARY, path);
   }
 
+  /**
+   * Returns the binary as a {@link FirefoxBinary} if it was set, or an empty {@link Optional} if
+   * not.
+   *
+   * @deprecated This method is deprecated and will be removed in a future version. Selenium Manager
+   *     handles this for you.}
+   */
+  @Deprecated
   public Optional<FirefoxBinary> getBinaryOrNull() {
     Object binary = firefoxOptions.get(Keys.BINARY.key());
     if (!(binary instanceof String)) {

java/src/org/openqa/selenium/ie/InternetExplorerDriver.java

@@ -33,13 +33,6 @@ public class InternetExplorerDriver extends RemoteWebDriver {
   /** Capability that defines whether to ignore the browser zoom level or not. */
   public static final String IGNORE_ZOOM_SETTING = "ignoreZoomSetting";
 
-  /**
-   * Capability that defines to use whether to use native or javascript events during operations.
-   *
-   * @deprecated Non W3C compliant
-   */
-  @Deprecated public static final String NATIVE_EVENTS = "nativeEvents";
-
   /** Capability that defines the initial URL to be used when IE is launched. */
   public static final String INITIAL_BROWSER_URL = "initialBrowserUrl";
 

java/src/org/openqa/selenium/ie/InternetExplorerOptions.java

@@ -28,7 +28,6 @@
 import static org.openqa.selenium.ie.InternetExplorerDriver.IGNORE_ZOOM_SETTING;
 import static org.openqa.selenium.ie.InternetExplorerDriver.INITIAL_BROWSER_URL;
 import static org.openqa.selenium.ie.InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS;
-import static org.openqa.selenium.ie.InternetExplorerDriver.NATIVE_EVENTS;
 import static org.openqa.selenium.ie.InternetExplorerDriver.REQUIRE_WINDOW_FOCUS;
 import static org.openqa.selenium.remote.Browser.IE;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
@@ -85,7 +84,6 @@ public class InternetExplorerOptions extends AbstractDriverOptions<InternetExplo
           INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS,
           REQUIRE_WINDOW_FOCUS,
           UPLOAD_DIALOG_TIMEOUT,
-          NATIVE_EVENTS,
           LEGACY_FILE_UPLOAD_DIALOG_HANDLING,
           ATTACH_TO_EDGE_CHROME,
           EDGE_EXECUTABLE_PATH,
@@ -202,16 +200,6 @@ public InternetExplorerOptions introduceFlakinessByIgnoringSecurityDomains() {
     return amend(INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS, true);
   }
 
-  /**
-   * Method that defines to use whether to use native or javascript events during operations.
-   *
-   * @deprecated Non W3C compliant
-   */
-  @Deprecated
-  public InternetExplorerOptions disableNativeEvents() {
-    return amend(NATIVE_EVENTS, false);
-  }
-
   public InternetExplorerOptions ignoreZoomSettings() {
     return amend(IGNORE_ZOOM_SETTING, true);
   }