[rb] remove Firefox::Binary class

rb/lib/selenium/webdriver/common/service.rb

@@ -37,19 +37,6 @@ def chrome(**opts)
         end
 
         def firefox(**opts)
-          binary_path = Firefox::Binary.path
-          args = opts.delete(:args)
-          case args
-          when Hash
-            args[:binary] ||= binary_path
-            opts[:args] = args
-          when Array
-            opts[:args] = ["--binary=#{binary_path}"]
-            opts[:args] += args
-          else
-            opts[:args] = ["--binary=#{binary_path}"]
-          end
-
           Firefox::Service.new(**opts)
         end
 

rb/lib/selenium/webdriver/firefox.rb

@@ -25,7 +25,6 @@ module Selenium
   module WebDriver
     module Firefox
       autoload :Extension, 'selenium/webdriver/firefox/extension'
-      autoload :Binary, 'selenium/webdriver/firefox/binary'
       autoload :ProfilesIni, 'selenium/webdriver/firefox/profiles_ini'
       autoload :Profile, 'selenium/webdriver/firefox/profile'
       autoload :Bridge, 'selenium/webdriver/firefox/bridge'
@@ -52,7 +51,12 @@ def self.driver_path
       end
 
       def self.path=(path)
-        Binary.path = path
+        Platform.assert_executable path
+        @path = path
+      end
+
+      def self.path
+        @path ||= nil
       end
     end # Firefox
   end # WebDriver

rb/lib/selenium/webdriver/firefox/options.rb

@@ -139,7 +139,10 @@ def log_level=(level)
         #
 
         def as_json(*)
-          {KEY => generate_as_json(super)}
+          options = super
+          options['binary'] ||= Firefox.path if Firefox.path
+
+          {KEY => generate_as_json(options)}
         end
 
         private

rb/spec/unit/selenium/webdriver/firefox/service_spec.rb

@@ -26,7 +26,6 @@ module WebDriver
 
       before do
         allow(Platform).to receive(:assert_executable).and_return(true)
-        allow(Firefox::Binary).to receive(:path).and_return('/foo/bar')
       end
 
       describe '#new' do
@@ -85,20 +84,20 @@ module WebDriver
           expect(service.executable_path).to eq path
         end
 
-        it 'provides binary path by default' do
+        it 'does not create args by default' do
           allow(Platform).to receive(:find_binary).and_return(service_path)
 
           service = Service.firefox
 
-          expect(service.instance_variable_get('@extra_args')).to eq(['--binary=/foo/bar'])
+          expect(service.instance_variable_get('@extra_args')).to be_empty
         end
 
         it 'uses provided args' do
           allow(Platform).to receive(:find_binary).and_return(service_path)
 
           service = Service.firefox(args: ['--foo', '--bar'])
 
-          expect(service.instance_variable_get('@extra_args')).to include('--foo', '--bar')
+          expect(service.instance_variable_get('@extra_args')).to eq ['--foo', '--bar']
         end
 
         # This is deprecated behavior
@@ -108,7 +107,7 @@ module WebDriver
           service = Service.firefox(args: {log: '/path/to/log',
                                            marionette_port: 4})
 
-          expect(service.instance_variable_get('@extra_args')).to include('--log=/path/to/log', '--marionette-port=4')
+          expect(service.instance_variable_get('@extra_args')).to eq ['--log=/path/to/log', '--marionette-port=4']
         end
       end
     end
@@ -120,7 +119,6 @@ module Firefox
 
         before do
           allow(Remote::Bridge).to receive(:new).and_return(bridge)
-          allow(Firefox::Binary).to receive(:path).and_return('/foo/bar')
         end
 
         it 'is not created when :url is provided' do
@@ -140,7 +138,7 @@ module Firefox
 
           expect(Service).to receive(:new).with(path: driver_path,
                                                 port: nil,
-                                                args: ['--binary=/foo/bar']).and_return(service)
+                                                args: nil).and_return(service)
 
           expect {
             described_class.new(driver_path: driver_path)
@@ -152,7 +150,7 @@ module Firefox
 
           expect(Service).to receive(:new).with(path: nil,
                                                 port: driver_port,
-                                                args: ['--binary=/foo/bar']).and_return(service)
+                                                args: nil).and_return(service)
 
           expect {
             described_class.new(port: driver_port)