lib/selenium/webdriver/firefox/w3c_bridge.rb in selenium-webdriver-3.2.1 vs lib/selenium/webdriver/firefox/w3c_bridge.rb in selenium-webdriver-3.2.2

@@ -21,30 +21,31 @@
   module WebDriver
     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_args = opts.delete(:service_args) || {}
 
-          driver_path = opts.delete(:driver_path) || Firefox.driver_path(false)
-          @service = Service.new(driver_path, port, *extract_service_args(service_args))
-          @service.start
-          opts[:url] = @service.uri
+          unless opts.key?(:url)
+            port = opts.delete(:port) || Service::DEFAULT_PORT
+            service_args = opts.delete(:service_args) || {}
 
+            driver_path = opts.delete(:driver_path) || Firefox.driver_path
+            @service = Service.new(driver_path, port, *extract_service_args(service_args))
+            @service.start
+            opts[:url] = @service.uri
+          end
+
           super(opts)
         end
 
         def browser
           :firefox
         end
 
         def driver_extensions
-          [
-            DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasWebStorage
-          ]
+          [DriverExtensions::TakesScreenshot,
+            DriverExtensions::HasWebStorage]
         end
 
         def quit
           super
         ensure