Minor cleanup.

SeleniumHQ · Feb 19, 2014 · b7305e3 · b7305e3
1 parent fbe29a9
commit b7305e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/rb/lib/selenium/webdriver/safari/bridge.rb b/rb/lib/selenium/webdriver/safari/bridge.rb
@@ -32,7 +32,7 @@ def quit
 
           @server.stop
           @safari.stop
-          @extensions && @extensions.uninstall
+          @extensions.uninstall
         end
 
         def driver_extensions

diff --git a/rb/lib/selenium/webdriver/safari/extensions.rb b/rb/lib/selenium/webdriver/safari/extensions.rb
@@ -100,6 +100,8 @@ def uninstall
 
           install_directory.rmtree if install_directory.exist?
           @backup.restore_all
+
+          nil
         ensure
           @installed = false
         end

diff --git a/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb b/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb
@@ -2,7 +2,7 @@ module Selenium
   module WebDriver
     module Safari
 
-      describe 'with custom extension', focus: true do
+      describe 'with custom extension' do
         before { GlobalTestEnv.quit_driver }
         after  { @driver.quit if @driver }
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,6 +100,8 @@ def uninstall @@
               install_directory.rmtree if install_directory.exist?
               @backup.restore_all
+              nil
             ensure
               @installed = false
             end
@@ Expand Down @@