[rb] Move common driver quit behavior to Common::Driver (#7318)

SeleniumHQ · Jun 23, 2019 · 5eb1ed0 · 5eb1ed0
1 parent f8b35a3
commit 5eb1ed0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 30 deletions.
diff --git a/rb/lib/selenium/webdriver/chrome/driver.rb b/rb/lib/selenium/webdriver/chrome/driver.rb
@@ -52,12 +52,6 @@ def browser
           :chrome
         end
 
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
-
         def execute_cdp(cmd, **params)
           @bridge.send_command(cmd: cmd, params: params)
         end

diff --git a/rb/lib/selenium/webdriver/common/driver.rb b/rb/lib/selenium/webdriver/common/driver.rb
@@ -168,6 +168,8 @@ def page_source
 
       def quit
         bridge.quit
+      ensure
+        @service&.stop
       end
 
       #

diff --git a/rb/lib/selenium/webdriver/edge_html/driver.rb b/rb/lib/selenium/webdriver/edge_html/driver.rb
@@ -47,12 +47,6 @@ def initialize(opts = {})
         def browser
           :edge
         end
-
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
       end # Driver
     end # Edge
   end # WebDriver

diff --git a/rb/lib/selenium/webdriver/firefox/driver.rb b/rb/lib/selenium/webdriver/firefox/driver.rb
@@ -49,12 +49,6 @@ def initialize(opts = {})
         def browser
           :firefox
         end
-
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
       end # Driver
     end # Firefox
   end # WebDriver

diff --git a/rb/lib/selenium/webdriver/ie/driver.rb b/rb/lib/selenium/webdriver/ie/driver.rb
@@ -48,12 +48,6 @@ def initialize(opts = {})
         def browser
           :internet_explorer
         end
-
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
       end # Driver
     end # IE
   end # WebDriver

diff --git a/rb/lib/selenium/webdriver/safari/driver.rb b/rb/lib/selenium/webdriver/safari/driver.rb
@@ -49,12 +49,6 @@ def initialize(opts = {})
         def browser
           :safari
         end
-
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
       end # Driver
     end # Safari
   end # WebDriver