rb - implement option for setting Firefox binary locally

Author: titusfortner

rb/lib/selenium/webdriver/firefox/bridge.rb

@@ -32,6 +32,8 @@ def initialize(opts = {})
 
           caps = opts.delete(:desired_capabilities) { Remote::Capabilities.firefox }
 
+          Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
+
           @launcher = create_launcher(port, profile)
 
           unless opts.empty?

rb/lib/selenium/webdriver/firefox/w3c_bridge.rb

@@ -27,9 +27,17 @@ class W3CBridge < Remote::W3CBridge
         def initialize(opts = {})
           http_client = opts.delete(:http_client)
 
+          opts.delete(:marionette)
+          caps = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.firefox }
+
           if opts.has_key?(:url)
             url = opts.delete(:url)
           else
+            Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
+            if Firefox::Binary.version < 43
+              raise ArgumentError, "Firefox Version #{Firefox::Binary.version} does not support Marionette; Set firefox_binary in Capabilities to point to a supported binary"
+            end
+
             @service = Service.default_service(*extract_service_args(opts))
 
             if @service.instance_variable_get("@host") == "127.0.0.1"
@@ -41,7 +49,9 @@ def initialize(opts = {})
             url = @service.uri
           end
 
-          caps = create_capabilities(opts)
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
+          end
 
           remote_opts = {
             :url                  => url,
@@ -71,16 +81,6 @@ def quit
 
         private
 
-        def create_capabilities(opts)
-          caps = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.firefox }
-
-          unless opts.empty?
-            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
-          end
-
-          caps
-        end
-
         def extract_service_args(opts)
           args = []
 

rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb

@@ -26,6 +26,27 @@ module Firefox
       compliant_on :driver => :firefox do
         describe Driver do
           describe ".new" do
+
+            it "should take a binary path as an argument" do
+              pending unless ENV['MARIONETTE_PATH']
+
+              begin
+                default_path = Firefox::Binary.path
+
+                driver1 = Selenium::WebDriver.for :firefox
+                default_version = driver1.capabilities[:version]
+                driver1.quit
+
+                caps = Remote::Capabilities.firefox(firefox_binary: ENV['MARIONETTE_PATH'])
+                driver2 = Selenium::WebDriver.for :firefox, :desired_capabilities => caps
+
+                expect(driver2.capabilities[:version]).to_not be == default_version
+                driver2.quit
+              ensure
+                Firefox::Binary.path = default_path
+              end
+            end
+
             it "should take a Firefox::Profile instance as argument" do
               begin
                 profile = Selenium::WebDriver::Firefox::Profile.new