Merge branch 'trunk' into pinned-browser-updates

diemol · web-flow · commit a248f5df4f7b · 2025-05-16T16:50:02.000+02:00
diff --git a/java/src/org/openqa/selenium/WebDriver.java b/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
diff --git a/java/src/org/openqa/selenium/firefox/Executable.java b/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();
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxBinary.java b/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"),
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxOptions.java b/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)) {
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java b/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";
 
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerOptions.java b/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);
   }
diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -955,12 +955,6 @@ public Window window() {
 
     protected class RemoteTimeouts implements Timeouts {
 
-      @Deprecated
-      @Override
-      public Timeouts implicitlyWait(long time, TimeUnit unit) {
-        return implicitlyWait(Duration.ofMillis(unit.toMillis(time)));
-      }
-
       @Override
       public Timeouts implicitlyWait(Duration duration) {
         execute(DriverCommand.SET_IMPLICIT_WAIT_TIMEOUT(duration));
diff --git a/java/src/org/openqa/selenium/support/pagefactory/AjaxElementLocator.java b/java/src/org/openqa/selenium/support/pagefactory/AjaxElementLocator.java
@@ -19,6 +19,7 @@
 
 import java.lang.reflect.Field;
 import java.time.Clock;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import org.openqa.selenium.NoSuchElementException;
@@ -137,7 +138,7 @@ private class SlowLoadingElement extends SlowLoadableComponent<SlowLoadingElemen
     private WebElement element;
 
     public SlowLoadingElement(Clock clock, int timeOutInSeconds) {
-      super(clock, timeOutInSeconds);
+      super(clock, Duration.ofSeconds(timeOutInSeconds));
     }
 
     @Override
@@ -178,7 +179,7 @@ private class SlowLoadingElementList extends SlowLoadableComponent<SlowLoadingEl
     private List<WebElement> elements;
 
     public SlowLoadingElementList(Clock clock, int timeOutInSeconds) {
-      super(clock, timeOutInSeconds);
+      super(clock, Duration.ofSeconds(timeOutInSeconds));
     }
 
     @Override
diff --git a/java/src/org/openqa/selenium/support/ui/SlowLoadableComponent.java b/java/src/org/openqa/selenium/support/ui/SlowLoadableComponent.java
@@ -38,14 +38,6 @@ public abstract class SlowLoadableComponent<T extends LoadableComponent<T>>
   private final Clock clock;
   private final Duration timeOut;
 
-  /**
-   * @deprecated Use {@link #SlowLoadableComponent(Clock, Duration)} instead.
-   */
-  @Deprecated
-  public SlowLoadableComponent(Clock clock, int timeOutInSeconds) {
-    this(clock, Duration.ofSeconds(timeOutInSeconds));
-  }
-
   public SlowLoadableComponent(Clock clock, Duration timeOut) {
     this.clock = clock;
     this.timeOut = timeOut;
diff --git a/java/test/org/openqa/selenium/firefox/FirefoxDriverTest.java b/java/test/org/openqa/selenium/firefox/FirefoxDriverTest.java
@@ -21,11 +21,8 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.firefox.FirefoxAssumptions.assumeDefaultBrowserLocationUsed;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
@@ -43,7 +40,6 @@
 import org.mockito.ArgumentMatchers;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.Dimension;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.JavascriptExecutor;
@@ -96,17 +92,6 @@ public void canStartDriverWithNoParameters() {
         .isEqualTo("firefox");
   }
 
-  @Test
-  @NoDriverBeforeTest
-  public void canStartDriverWithSpecifiedBinary() {
-    FirefoxBinary binary = spy(new FirefoxBinary());
-    FirefoxOptions options = new FirefoxOptions().setBinary(binary);
-
-    localDriver = new WebDriverBuilder().get(options);
-
-    verify(binary, atLeastOnce()).getPath();
-  }
-
   @Test
   void shouldGetMeaningfulExceptionOnBrowserDeath() throws Exception {
     RemoteWebDriver driver2 = (RemoteWebDriver) new WebDriverBuilder().get();
@@ -175,20 +160,6 @@ public void shouldBeAbleToStartANewInstanceEvenWithVerboseLogging() {
     new FirefoxDriver(service, (FirefoxOptions) FIREFOX.getCapabilities()).quit();
   }
 
-  @Test
-  @NoDriverBeforeTest
-  public void shouldBeAbleToPassCommandLineOptions() {
-    FirefoxBinary binary = new FirefoxBinary();
-    binary.addCommandLineOptions("-width", "800", "-height", "600");
-
-    localDriver = new WebDriverBuilder().get(new FirefoxOptions().setBinary(binary));
-    Dimension size = localDriver.manage().window().getSize();
-    assertThat(size.width).isGreaterThanOrEqualTo(800);
-    assertThat(size.width).isLessThan(850);
-    assertThat(size.height).isGreaterThanOrEqualTo(600);
-    assertThat(size.height).isLessThan(650);
-  }
-
   @Test
   @NoDriverBeforeTest
   public void canPassCapabilities() {
diff --git a/java/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java b/java/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java
@@ -17,9 +17,7 @@
 
 package org.openqa.selenium.firefox;
 
-import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
 import static java.util.Collections.emptyMap;
-import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -28,7 +26,6 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
 import static org.assertj.core.api.InstanceOfAssertFactories.STRING;
 import static org.openqa.selenium.PageLoadStrategy.EAGER;
-import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_BINARY;
 import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_PROFILE;
 import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.DEBUG;
 import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.ERROR;
@@ -40,11 +37,9 @@
 import com.google.common.collect.ImmutableMap;
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.attribute.PosixFilePermission;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -56,7 +51,6 @@
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.PageLoadStrategy;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.testing.TestUtilities;
@@ -91,43 +85,6 @@ void binaryPathNeedNotExist() {
     new FirefoxOptions().setBinary("does/not/exist");
   }
 
-  @Test
-  void shouldKeepRelativePathToBinaryAsIs() {
-    String path = String.join(File.separator, "some", "path");
-    FirefoxOptions options = new FirefoxOptions().setBinary(path);
-    assertThat(options.getBinary())
-        .extracting(FirefoxBinary::getFile)
-        .extracting(String::valueOf)
-        .isEqualTo(path);
-  }
-
-  @Test
-  void shouldKeepWindowsDriveLetterInPathToBinary() {
-    FirefoxOptions options = new FirefoxOptions().setBinary("F:\\some\\path");
-    assertThat(options.getBinary())
-        .extracting(FirefoxBinary::getFile)
-        .extracting(String::valueOf)
-        .isEqualTo("F:\\some\\path");
-  }
-
-  @Test
-  void shouldKeepWindowsNetworkFileSystemRootInPathToBinary() {
-    FirefoxOptions options = new FirefoxOptions().setBinary("\\\\server\\share\\some\\path");
-    assertThat(options.getBinary())
-        .extracting(FirefoxBinary::getFile)
-        .extracting(String::valueOf)
-        .isEqualTo("\\\\server\\share\\some\\path");
-  }
-
-  @Test
-  void shouldKeepAFirefoxBinaryAsABinaryIfSetAsOne() throws IOException {
-    File fakeExecutable = Files.createTempFile("firefox", ".exe").toFile();
-    fakeExecutable.deleteOnExit();
-    FirefoxBinary binary = new FirefoxBinary(fakeExecutable);
-    FirefoxOptions options = new FirefoxOptions().setBinary(binary);
-    assertThat(options.getBinary().getFile()).isEqualTo(binary.getFile());
-  }
-
   @Test
   void stringBasedBinaryRemainsAbsoluteIfSetAsAbsolute() {
     Map<String, Object> json = new FirefoxOptions().setBinary("/i/like/cheese").asMap();
@@ -147,28 +104,6 @@ void pathBasedBinaryRemainsAbsoluteIfSetAsAbsolute() {
         .containsEntry("binary", path);
   }
 
-  @Test
-  void shouldPickUpBinaryFromSystemPropertyIfSet() throws IOException {
-    JreSystemProperty property = new JreSystemProperty(BROWSER_BINARY);
-
-    Path binary = Files.createTempFile("firefox", ".exe");
-    try (OutputStream ignored = Files.newOutputStream(binary, DELETE_ON_CLOSE)) {
-      Files.write(binary, "".getBytes());
-      if (!TestUtilities.getEffectivePlatform().is(Platform.WINDOWS)) {
-        Files.setPosixFilePermissions(binary, singleton(PosixFilePermission.OWNER_EXECUTE));
-      }
-      property.set(binary.toString());
-      FirefoxOptions options = new FirefoxOptions().configureFromEnv();
-
-      FirefoxBinary firefoxBinary =
-          options.getBinaryOrNull().orElseThrow(() -> new AssertionError("No binary"));
-
-      assertThat(firefoxBinary.getPath()).isEqualTo(binary.toString());
-    } finally {
-      property.reset();
-    }
-  }
-
   @Test
   void shouldPickUpProfileFromSystemProperty() {
     FirefoxProfile defaultProfile = new ProfilesIni().getProfile("default");
diff --git a/java/test/org/openqa/selenium/support/decorators/DecoratedTimeoutsTest.java b/java/test/org/openqa/selenium/support/decorators/DecoratedTimeoutsTest.java
@@ -61,7 +61,7 @@ private void verifyFunction(Consumer<WebDriver.Timeouts> f) {
 
   @Test
   void implicitlyWaitLegacy() {
-    verifyFunction($ -> $.implicitlyWait(10, TimeUnit.SECONDS));
+    verifyFunction($ -> $.implicitlyWait(Duration.ofSeconds(10)));
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/support/ui/SlowLoadableComponentTest.java b/java/test/org/openqa/selenium/support/ui/SlowLoadableComponentTest.java
diff --git a/java/test/org/openqa/selenium/testing/drivers/Browser.java b/java/test/org/openqa/selenium/testing/drivers/Browser.java
