No longer force marionette on the desired firefox capabilities

The DesiredCapabilities.firefox() always set the marionette
capability to "true". This was needed during the transition
from Se2 to Se3, but is distinctly unhelpful right now.

Author: shs96c

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.firefox;
 
+import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE;
 import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 
@@ -273,6 +274,7 @@ private static FirefoxOptions getFirefoxOptions(Capabilities capabilities) {
     }
 
     Object marionette = capabilities.getCapability(MARIONETTE);
+
     if (marionette instanceof Boolean) {
       options.setLegacy(!(Boolean) marionette);
     }
@@ -339,7 +341,7 @@ private static boolean isLegacy(Capabilities desiredCapabilities) {
   }
 
   private static Boolean forceMarionetteFromSystemProperty() {
-    String useMarionette = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
+    String useMarionette = System.getProperty(DRIVER_USE_MARIONETTE);
     if (useMarionette == null) {
       return null;
     }

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

@@ -407,6 +407,11 @@ private FirefoxOptions validateAndAmendUsing(DesiredCapabilities existing, Capab
       }
     }
 
+    Object rawMarionette = existing.getCapability(MARIONETTE);
+    if (rawMarionette instanceof Boolean) {
+      setLegacy(!(Boolean) rawMarionette);
+    }
+
     return this;
   }
 

java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java

@@ -206,11 +206,7 @@ public static DesiredCapabilities chrome() {
   }
 
   public static DesiredCapabilities firefox() {
-    DesiredCapabilities
-      caps = new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
-    // Avoid a circular reference between the firefox driver and the remote driver
-    caps.setCapability("marionette", true);
-    return caps;
+    return new DesiredCapabilities(BrowserType.FIREFOX, "", Platform.ANY);
   }
 
   public static DesiredCapabilities htmlUnit() {
@@ -220,7 +216,7 @@ public static DesiredCapabilities htmlUnit() {
   public static DesiredCapabilities htmlUnitWithJs() {
     DesiredCapabilities capabilities = new DesiredCapabilities(BrowserType.HTMLUNIT,
                                                                "", Platform.ANY);
-    capabilities.setJavascriptEnabled(true);
+    capabilities.setCapability(CapabilityType.SUPPORTS_JAVASCRIPT, true);
     return capabilities;
   }
 

java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java

@@ -61,9 +61,8 @@ public void binaryPathNeedNotExist() {
   }
 
   @Test
-  public void canSetBinaryThroughOptions() throws IOException {
+  public void canSetBinaryThroughOptions() {
     FirefoxOptions options = new FirefoxOptions().setBinary("some/path");
-
     Capabilities caps = options.addTo(new DesiredCapabilities());
 
     assertEquals("some/path", caps.getCapability(FirefoxDriver.BINARY));
@@ -139,6 +138,23 @@ public void shouldPickUpLegacyValueFromSystemProperty() throws IOException {
     }
   }
 
+  @Test
+  public void settingMarionetteToFalseAsASystemPropertyDoesNotPrecedence() {
+    JreSystemProperty property = new JreSystemProperty(DRIVER_USE_MARIONETTE);
+    String resetValue = property.get();
+
+    try {
+      DesiredCapabilities caps = new DesiredCapabilities();
+      caps.setCapability(FirefoxDriver.MARIONETTE, true);
+
+      property.set("false");
+      FirefoxOptions options = new FirefoxOptions().addDesiredCapabilities(caps);
+      assertFalse(options.isLegacy());
+    } finally {
+      property.set(resetValue);
+    }
+  }
+
   @Test
   public void shouldPickUpProfileFromSystemProperty() throws IOException {
     FirefoxProfile defaultProfile = new ProfilesIni().getProfile("default");