[rb] ensure driver process is always stopped

Author: titusfortner

rb/lib/selenium/webdriver/chrome/driver.rb

@@ -31,8 +31,9 @@ class Driver < Chromium::Driver
         include LocalDriver
 
         def initialize(options: nil, service: nil, url: nil, **)
-          caps, url = initialize_local_driver(options, service, url)
-          super(caps: caps, url: url, **)
+          initialize_local_driver(options, service, url) do |caps, driver_url|
+            super(caps: caps, url: driver_url, **)
+          end
         end
 
         def browser

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

@@ -326,11 +326,6 @@ def create_bridge(caps:, url:, http_client: nil)
         end
       end
 
-      def service_url(service)
-        @service_manager = service.launch
-        @service_manager.uri
-      end
-
       def screenshot
         bridge.screenshot
       end

rb/lib/selenium/webdriver/common/local_driver.rb

@@ -27,7 +27,17 @@ def initialize_local_driver(options, service, url)
         caps = process_options(options, service)
         url = service_url(service)
 
-        [caps, url]
+        begin
+          yield(caps, url) if block_given?
+        rescue Selenium::WebDriver::Error::WebDriverError
+          @service_manager&.stop
+          raise
+        end
+      end
+
+      def service_url(service)
+        @service_manager = service.launch
+        @service_manager.uri
       end
 
       def process_options(options, service)

rb/lib/selenium/webdriver/edge/driver.rb

@@ -31,8 +31,9 @@ class Driver < Chromium::Driver
         include LocalDriver
 
         def initialize(options: nil, service: nil, url: nil, **)
-          caps, url = initialize_local_driver(options, service, url)
-          super(caps: caps, url: url, **)
+          initialize_local_driver(options, service, url) do |caps, driver_url|
+            super(caps: caps, url: driver_url, **)
+          end
         end
 
         def browser

rb/lib/selenium/webdriver/firefox/driver.rb

@@ -37,8 +37,9 @@ class Driver < WebDriver::Driver
         include LocalDriver
 
         def initialize(options: nil, service: nil, url: nil, **)
-          caps, url = initialize_local_driver(options, service, url)
-          super(caps: caps, url: url, **)
+          initialize_local_driver(options, service, url) do |caps, driver_url|
+            super(caps: caps, url: driver_url, **)
+          end
         end
 
         def browser

rb/lib/selenium/webdriver/ie/driver.rb

@@ -32,8 +32,9 @@ class Driver < WebDriver::Driver
         include LocalDriver
 
         def initialize(options: nil, service: nil, url: nil, **)
-          caps, url = initialize_local_driver(options, service, url)
-          super(caps: caps, url: url, **)
+          initialize_local_driver(options, service, url) do |caps, driver_url|
+            super(caps: caps, url: driver_url, **)
+          end
         end
 
         def browser

rb/lib/selenium/webdriver/safari/driver.rb

@@ -32,8 +32,9 @@ class Driver < WebDriver::Driver
         include LocalDriver
 
         def initialize(options: nil, service: nil, url: nil, **)
-          caps, url = initialize_local_driver(options, service, url)
-          super(caps: caps, url: url, **)
+          initialize_local_driver(options, service, url) do |caps, driver_url|
+            super(caps: caps, url: driver_url, **)
+          end
         end
 
         def browser