Using a DesiredCapabilities to control WDBS won't always work since the

jleyba · jleyba · commit 3f5ee5ca8549 · 2013-03-22T10:04:22.000-07:00
user may not have access to the capabilities (or the driver won't implement
HasCapabilities). Add a method to WebDriverCommandProcessor to control
whether to emulate Selenium's alert API.
diff --git a/java/client/src/org/openqa/selenium/WebDriverCommandProcessor.java b/java/client/src/org/openqa/selenium/WebDriverCommandProcessor.java
@@ -17,7 +17,6 @@
 package org.openqa.selenium;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Maps;
 
@@ -35,17 +34,11 @@
  */
 public class WebDriverCommandProcessor implements CommandProcessor, WrapsDriver {
 
-  /**
-   * Capability key that dictates whether to emulate Selenium's alert handling and override
-   * the native alert functions. Defaults to true.
-   */
-  public static final String ENABLE_ALERT_OVERRIDES_CAPABILITY =
-      "selenium.emulation.overrideAlerts";
-
   private final Map<String, SeleneseCommand<?>> seleneseMethods = Maps.newHashMap();
   private final String baseUrl;
   private final Timer timer;
   private final CompoundMutator scriptMutator;
+  private boolean enableAlertOverrides = true;
   private Supplier<WebDriver> maker;
   private WebDriver driver;
 
@@ -179,22 +172,21 @@ protected void assertDriverSupportsJavascript(WebDriver driver) {
     }
   }
 
-  private boolean enableOverrides() {
-    Optional<Boolean> enableOverrides = Optional.absent();
-    if (driver instanceof HasCapabilities) {
-      Object tmp = ((HasCapabilities) driver).getCapabilities().getCapability(
-          ENABLE_ALERT_OVERRIDES_CAPABILITY);
-      enableOverrides = Optional.fromNullable((Boolean) tmp);
-    }
-    return enableOverrides.or(true);  // Default to true if capability wasn't specified.
+  /**
+   * Sets whether to enable emulation of Selenium's alert handling functions or
+   * to preserve WebDriver's alert handling. This has no affect after calling
+   * {@link #start()}.
+   */
+  public void setEnableAlertOverrides(boolean enableAlertOverrides) {
+    this.enableAlertOverrides = enableAlertOverrides;
   }
 
   private void setUpMethodMap() {
     JavascriptLibrary javascriptLibrary = new JavascriptLibrary();
     ElementFinder elementFinder = new ElementFinder(javascriptLibrary);
     KeyState keyState = new KeyState();
 
-    AlertOverride alertOverride = new AlertOverride(enableOverrides());
+    AlertOverride alertOverride = new AlertOverride(enableAlertOverrides);
     Windows windows = new Windows(driver);
 
     // Note the we use the names used by the CommandProcessor
