lib/watirspec.rb in watir-6.13.0 vs lib/watirspec.rb in watir-6.14.0

@@ -1,17 +1,17 @@
-require "tmpdir"
+require 'tmpdir'
 require 'watirspec/guards'
 require 'watirspec/implementation'
 require 'watirspec/runner'
 require 'watirspec/server'
 
 module WatirSpec
   class << self
-    attr_accessor :browser_args, :unguarded, :implementation
+    attr_accessor :browser_args, :unguarded
 
     def htmls
-      @htmls ||= [File.expand_path("../../spec/watirspec/html", __FILE__)]
+      @htmls ||= [File.expand_path('../spec/watirspec/html', __dir__)]
     end
 
     def run!
       load_support
       WatirSpec::Runner.execute_if_necessary
@@ -28,23 +28,23 @@
     def unguarded?
       @unguarded ||= false
     end
 
     def load_support
-      root = File.expand_path("../../spec/watirspec", __FILE__)
+      root = File.expand_path('../spec/watirspec', __dir__)
       Dir.glob("#{root}/support/**/*.rb").each do |file|
         require file
       end
     end
 
     def implementation
-      @implementation ||= (
+      @implementation ||= begin
         imp = WatirSpec::Implementation.new
         yield imp if block_given?
 
         imp
-      )
+      end
     end
 
     def implementation=(imp)
       unless imp.is_a?(WatirSpec::Implementation)
         raise TypeError, "expected WatirSpec::Implementation, got #{imp.class}"
@@ -53,11 +53,11 @@
       @implementation = imp
     end
 
     def new_browser
       klass = WatirSpec.implementation.browser_class
-      args = Array(WatirSpec.implementation.browser_args).map { |e| Hash === e ? e.dup : e }
+      args = Array(WatirSpec.implementation.browser_args).map { |e| e.is_a?(Hash) ? e.dup : e }
 
       instance = klass.new(*args)
       print_browser_info_once(instance)
 
       instance
@@ -65,23 +65,23 @@
 
     private
 
     def print_browser_info_once(instance)
       return if defined?(@did_print_browser_info) && @did_print_browser_info
+
       @did_print_browser_info = true
 
       info = []
       info << instance.class.name
 
       caps = instance.driver.capabilities
 
-      info << "#{caps.browser_name}"
-      info << "#{caps.version}"
+      info << caps.browser_name.to_s
+      info << caps.version.to_s
 
       Watir.logger.warn "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}",
                         ids: [:browser_info]
-    rescue
+    rescue StandardError
       # ignored
     end
-
   end # class << WatirSpec
 end # WatirSpec