Add the ability to start FirefoxDriver backed with Marionette via a capability

When starting FirefoxDriver change the capability `marionette` to True
and supply any marionette related capabilities to the object before starting
the session.

Author: AutomatedTester

Diff for: py/selenium/webdriver/common/desired_capabilities.py

@@ -23,7 +23,7 @@ class DesiredCapabilities(object):
     """
     Set of default supported desired capabilities.
 
-    Use this as a starting point for creating a desired capabilities object for 
+    Use this as a starting point for creating a desired capabilities object for
     requesting remote webdrivers for connecting to selenium server or selenium grid.
 
 
@@ -39,7 +39,7 @@ class DesiredCapabilities(object):
         capabilities['version'] = "10"
 
         # Instantiate an instance of Remote WebDriver with the desired capabilities.
-        driver = webdriver.Remote(desired_capabilities=capabilities, 
+        driver = webdriver.Remote(desired_capabilities=capabilities,
                                   command_executor=selenium_grid_url)
 
     Note: Always use '.copy()' on the DesiredCapabilities object to avoid the side
@@ -52,6 +52,7 @@ class DesiredCapabilities(object):
         "version": "",
         "platform": "ANY",
         "javascriptEnabled": True,
+        "marionette": False,
     }
 
     INTERNETEXPLORER = {
@@ -122,4 +123,3 @@ class DesiredCapabilities(object):
         "platform": "ANY",
         "javascriptEnabled": True,
     }
-

Diff for: py/selenium/webdriver/firefox/webdriver.py

@@ -37,7 +37,7 @@ class WebDriver(RemoteWebDriver):
     # There is no native event support on Mac
     NATIVE_EVENTS_ALLOWED = sys.platform != "darwin"
 
-    def __init__(self, firefox_profile=None, firefox_binary='/Users/dburns/development/mozilla/mozilla-inbound/obj-ff-dbg/dist/Nightly.app/Contents/MacOS/firefox', timeout=30,
+    def __init__(self, firefox_profile=None, firefox_binary=None, timeout=30,
                  capabilities=None, proxy=None, executable_path='wires'):
 
         self.binary = firefox_binary
@@ -49,22 +49,36 @@ def __init__(self, firefox_profile=None, firefox_binary='/Users/dburns/developme
         self.profile.native_events_enabled = (
             self.NATIVE_EVENTS_ALLOWED and self.profile.native_events_enabled)
 
-        if self.binary is None:
-            self.binary = FirefoxBinary()
-
         if capabilities is None:
             capabilities = DesiredCapabilities.FIREFOX
 
-        if proxy is not None:
-            proxy.add_to_capabilities(capabilities)
-
-        self.service = Service(executable_path, firefox_binary=self.binary)
-        self.service.start()
-
-        RemoteWebDriver.__init__(self,
-            command_executor=self.service.service_url,
+        if "marionette" in capabilities and capabilities['marionette'] is True:
+            # Let's use Marionette! WOOOOHOOOOO!
+            if "binary" in capabilities:
+                self.binary = capabilities["binary"]
+            self.service = Service(executable_path, firefox_binary=self.binary)
+            self.service.start()
+
+            RemoteWebDriver.__init__(self,
+                command_executor=self.service.service_url,
+                desired_capabilities=capabilities,
+                keep_alive=True)
+
+        else:
+            # Oh well... sometimes the old way is the best way.
+            if self.binary is None:
+                self.binary = FirefoxBinary()
+
+            if proxy is not None:
+                proxy.add_to_capabilities(capabilities)
+
+            RemoteWebDriver.__init__(self,
+            command_executor=ExtensionConnection("127.0.0.1", self.profile,
+            self.binary, timeout),
             desired_capabilities=capabilities,
             keep_alive=True)
+
+
         self._is_remote = False
 
     def quit(self):