Rebase from master and fix rubocop warnings

qinggumeng · Mar 6, 2019 · 2abd80f · 2abd80f
1 parent 34522d1
commit 2abd80f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rb/lib/selenium/webdriver/common/socket_poller.rb b/rb/lib/selenium/webdriver/common/socket_poller.rb
@@ -80,7 +80,7 @@ def listening?
         sock.close
         true
       rescue *NOT_CONNECTED_ERRORS
-        sock.close if sock
+        sock&.close
         WebDriver.logger.debug("polling for socket on #{[@host, @port].inspect}")
         false
       end

diff --git a/rb/lib/selenium/webdriver/safari/service.rb b/rb/lib/selenium/webdriver/safari/service.rb
@@ -26,7 +26,7 @@ module Safari
 
       class Service < WebDriver::Service
         DEFAULT_PORT = 7050
-        @executable = 'safaridriver'.freeze
+        @executable = 'safaridriver'
         @missing_text = <<-ERROR.gsub(/\n +| {2,}/, ' ').freeze
           Unable to find Apple's safaridriver which comes with Safari 10.
           More info at https://webkit.org/blog/6900/webdriver-support-in-safari-10/