rb - implement support for new geckodriver options

Author: titusfortner

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

@@ -23,12 +23,10 @@ module Firefox
       # @api private
       class W3CBridge < Remote::W3CBridge
         def initialize(opts = {})
-          caps = opts[:desired_capabilities] ||= Remote::W3CCapabilities.firefox
-          Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
+          opts[:desired_capabilities] = create_capabilities(opts)
 
           @service = Service.new(Firefox.driver_path, Service::DEFAULT_PORT)
           @service.start
-
           opts[:url] = @service.uri
 
           super(opts)
@@ -51,6 +49,17 @@ def quit
         ensure
           @service.stop if @service
         end
+
+        private
+
+        def create_capabilities(opts)
+          caps = opts.delete(:desired_capabilities) || Remote::W3CCapabilities.firefox
+          firefox_options_caps = caps[:firefox_options] || {}
+          caps[:firefox_options] = firefox_options_caps.merge(opts[:firefox_options] || {})
+
+          Binary.path = caps[:firefox_options][:binary] if caps[:firefox_options].key?(:binary)
+          caps
+        end
       end # W3CBridge
     end # Firefox
   end # WebDriver

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

@@ -63,28 +63,24 @@ def restart_remote_server
           end
         end
 
-        # Test this in isolation; Firefox doesn't like to switch between binaries in same session
-        not_compliant_on driver: :remote do
-          it 'takes a binary path as an argument' do
-            pending "Set ENV['ALT_FIREFOX_BINARY'] to test this" unless ENV['ALT_FIREFOX_BINARY']
-
-            begin
-              driver1 = Selenium::WebDriver.for GlobalTestEnv.driver, @opt
+        it 'takes a binary path as an argument' do
+          pending "Set ENV['ALT_FIREFOX_BINARY'] to test this" unless ENV['ALT_FIREFOX_BINARY']
+          begin
+            driver1 = Selenium::WebDriver.for GlobalTestEnv.driver, @opt.dup
 
-              default_version = driver1.capabilities.version
-              expect { driver1.capabilities.browser_version }.to_not raise_exception NoMethodError
-              driver1.quit
+            default_version = driver1.capabilities.version
+            expect { driver1.capabilities.browser_version }.to_not raise_exception NoMethodError
+            driver1.quit
 
-              caps = Remote::Capabilities.firefox(firefox_binary: ENV['ALT_FIREFOX_BINARY'])
-              @opt[:desired_capabilities] = caps
-              driver2 = Selenium::WebDriver.for GlobalTestEnv.driver, @opt
+            caps = Remote::Capabilities.firefox(firefox_options: {binary: ENV['ALT_FIREFOX_BINARY']})
+            @opt[:desired_capabilities] = caps
+            driver2 = Selenium::WebDriver.for GlobalTestEnv.driver, @opt
 
-              expect(driver2.capabilities.version).to_not eql(default_version)
-              expect { driver2.capabilities.browser_version }.to_not raise_exception NoMethodError
-              driver2.quit
-            ensure
-              Firefox::Binary.reset_path!
-            end
+            expect(driver2.capabilities.version).to_not eql(default_version)
+            expect { driver2.capabilities.browser_version }.to_not raise_exception NoMethodError
+            driver2.quit
+          ensure
+            Firefox::Binary.reset_path!
           end
         end