[rb] update safety checks

SeleniumHQ · Nov 26, 2022 · 59763fc · 59763fc
1 parent 71657e9
commit 59763fc
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb b/rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb
@@ -31,6 +31,7 @@ def initialize
 
           @driver = ENV.fetch('WD_SPEC_DRIVER', :chrome).to_sym
           @driver_instance = nil
+          @remote_server = nil
         end
 
         def print_env
@@ -61,9 +62,7 @@ def reset_driver!(time = 0)
         end
 
         def quit_driver
-          return unless @driver_instance
-
-          @driver_instance.quit
+          @driver_instance&.quit
         ensure
           @driver_instance = nil
         end
@@ -83,7 +82,7 @@ def remote_server
         end
 
         def reset_remote_server
-          @remote_server.stop if defined? @remote_server
+          @remote_server&.stop
           @remote_server = nil
           remote_server
         end
@@ -110,7 +109,7 @@ def remote_server_jar
         def quit
           app_server.stop
 
-          @remote_server.stop if defined? @remote_server
+          @remote_server&.stop
 
           @driver_instance = @app_server = @remote_server = nil
         end