rb - minor options tidying

Author: titusfortner

rb/lib/selenium/webdriver/chrome/bridge.rb

@@ -84,6 +84,7 @@ def create_capabilities(opts)
 
           caps[:chrome_options] = chrome_options
           caps[:proxy] = opts.delete(:proxy) if opts.key?(:proxy)
+          caps[:proxy] ||= opts.delete('proxy') if opts.key?('proxy')
 
           caps
         end

rb/lib/selenium/webdriver/common/driver.rb

@@ -44,7 +44,7 @@ def for(browser, opts = {})
           listener = opts.delete(:listener)
 
           bridge = case browser
-                   when :firefox, :ff, :marionette
+                   when :firefox, :ff
                      if Remote::W3CCapabilities.w3c?(opts)
                        Firefox::W3CBridge.new(opts)
                      else

rb/lib/selenium/webdriver/edge.rb

@@ -45,15 +45,6 @@ def self.driver_path
           path
         end
       end
-
-      def self.path=(path)
-        Platform.assert_executable path
-        @path = path
-      end
-
-      def self.path
-        @path ||= nil
-      end
     end # Edge
   end # WebDriver
 end # Selenium

rb/lib/selenium/webdriver/safari/apple_bridge.rb

@@ -43,7 +43,7 @@ def quit
         private
 
         def extract_service_args(args = {})
-          ["–host=#{args[:port]}"] if args.key? :port
+          args.key?(:port) ? ["--port=#{args[:port]}"] : []
         end
       end # AppleBridge
     end # Safari