Remove deprecated methods from FirefoxOptions

odedniv · Aug 29, 2017 · aba4bb0 · aba4bb0
1 parent 3528c0c
commit aba4bb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java b/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java
@@ -410,22 +410,6 @@ public FirefoxOptions setUnhandledPromptBehaviour(UnexpectedAlertBehaviour behav
     return this;
   }
 
-  /**
-   * @deprecated Use {@link #addCapabilities(Capabilities)}
-   */
-  @Deprecated
-  public FirefoxOptions addDesiredCapabilities(Capabilities desiredCapabilities) {
-    return addCapabilities(desiredCapabilities);
-  }
-
-  /**
-   * @deprecated Use {@link #addCapabilities(Capabilities)}
-   */
-  @Deprecated
-  public FirefoxOptions addRequiredCapabilities(Capabilities requiredCapabilities) {
-    return addCapabilities(requiredCapabilities);
-  }
-
   public FirefoxOptions addCapabilities(Capabilities capabilities) {
     return validateAndAmendUsing(this.desiredCapabilities, capabilities);
   }

diff --git a/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java b/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java
@@ -90,7 +90,7 @@ public void shouldBeAbleToMergeDesiredOptionsIntoFirefoxOptions() {
 
     FirefoxOptions options = new FirefoxOptions();
     options.setProfile(new FirefoxProfile());
-    options.addDesiredCapabilities(caps);
+    options.addCapabilities(caps);
 
     localDriver = new RemoteWebDriver(remoteUrl, options.toDesiredCapabilities());
     localDriver.get(pages.xhtmlTestPage);
@@ -103,7 +103,7 @@ public void canStartFirefoxWithoutAnyConfigurationOptions() {
     caps.setBrowserName(DesiredCapabilities.firefox().getBrowserName());
 
     FirefoxOptions options = new FirefoxOptions();
-    options.addDesiredCapabilities(caps);
+    options.addCapabilities(caps);
 
     localDriver = new RemoteWebDriver(remoteUrl, options.toDesiredCapabilities());
     localDriver.get(pages.xhtmlTestPage);