rb - implement :port parameter for all drivers

Author: titusfortner

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

@@ -23,8 +23,9 @@ module Chrome
       # @api private
       class Bridge < Remote::Bridge
         def initialize(opts = {})
+          port = opts.delete(:port) || Service::DEFAULT_PORT
           unless opts.key?(:url)
-            @service = Service.new(Chrome.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
+            @service = Service.new(Chrome.driver_path, port, *extract_service_args(opts))
             @service.start
             opts[:url] = @service.uri
           end

rb/lib/selenium/webdriver/edge/bridge.rb

@@ -26,8 +26,9 @@ module Edge
 
       class Bridge < Remote::W3CBridge
         def initialize(opts = {})
+          port = opts.delete(:port) || Service::DEFAULT_PORT
           unless opts.key?(:url)
-            @service = Service.new(Edge.driver_path, Service::DEFAULT_PORT)
+            @service = Service.new(Edge.driver_path, port)
             @service.host = 'localhost' if @service.host == '127.0.0.1'
             @service.start
             opts[:url] = @service.uri

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

@@ -23,9 +23,10 @@ module Firefox
       # @api private
       class W3CBridge < Remote::W3CBridge
         def initialize(opts = {})
+          port = opts.delete(:port) || Service::DEFAULT_PORT
           opts[:desired_capabilities] = create_capabilities(opts)
 
-          @service = Service.new(Firefox.driver_path, Service::DEFAULT_PORT)
+          @service = Service.new(Firefox.driver_path, port)
           @service.start
           opts[:url] = @service.uri
 

rb/lib/selenium/webdriver/ie/bridge.rb

@@ -26,7 +26,7 @@ module IE
 
       class Bridge < Remote::Bridge
         def initialize(opts = {})
-          port = opts.delete(:port) { Service::DEFAULT_PORT }
+          port = opts.delete(:port) || Service::DEFAULT_PORT
 
           @service = Service.new(IE.driver_path, port, *extract_service_args(opts))
           @service.start

rb/lib/selenium/webdriver/phantomjs/bridge.rb

@@ -26,11 +26,12 @@ module PhantomJS
 
       class Bridge < Remote::Bridge
         def initialize(opts = {})
+          port = opts.delete(:port) || Service::DEFAULT_PORT
           opts[:desired_capabilities] ||= Remote::Capabilities.phantomjs
 
           unless opts.key?(:url)
             args = opts.delete(:args) || opts[:desired_capabilities]['phantomjs.cli.args']
-            @service = Service.new(PhantomJS.path, Service::DEFAULT_PORT, *args)
+            @service = Service.new(PhantomJS.path, port, *args)
             @service.start
             opts[:url] = @service.uri
           end

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

@@ -23,9 +23,10 @@ module Safari
       # @api private
       class AppleBridge < Remote::Bridge
         def initialize(opts = {})
+          port = opts.delete(:port) || Service::DEFAULT_PORT
           opts[:desired_capabilities] ||= Remote::Capabilities.safari
 
-          @service = Service.new(Safari.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
+          @service = Service.new(Safari.driver_path, port, *extract_service_args(opts))
           @service.start
           opts[:url] = @service.uri