watir 6.13.0 → 6.14.0

data/lib/watir/xpath_support.rb

@@ -1,10 +1,9 @@
 module Watir
   module XpathSupport
-
     def self.escape(value)
       if value.include? "'"
         parts = value.split("'", -1).map { |part| "'#{part}'" }
-        string = parts.join(%{,"'",})
+        string = parts.join(%(,"'",))
 
         "concat(#{string})"
       else
@@ -15,6 +14,5 @@ module Watir
     def self.downcase(value)
       "translate(#{value},'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"
     end
-
   end # XpathSupport
 end # Watir

data/lib/watirspec.rb

@@ -1,4 +1,4 @@
-require "tmpdir"
+require 'tmpdir'
 require 'watirspec/guards'
 require 'watirspec/implementation'
 require 'watirspec/runner'
@@ -6,10 +6,10 @@ 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!
@@ -30,19 +30,19 @@ module WatirSpec
     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)
@@ -55,7 +55,7 @@ module WatirSpec
 
     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)
@@ -67,6 +67,7 @@ module WatirSpec
 
     def print_browser_info_once(instance)
       return if defined?(@did_print_browser_info) && @did_print_browser_info
+
       @did_print_browser_info = true
 
       info = []
@@ -74,14 +75,13 @@ module WatirSpec
 
       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

data/lib/watirspec/guards.rb

@@ -1,6 +1,5 @@
 module WatirSpec
   module Guards
-
     class << self
       def guards
         @guards ||= Hash.new { |hash, key| hash[key] = [] }
@@ -12,13 +11,13 @@ module WatirSpec
 
       def report
         gs = WatirSpec.implementation.matching_guards_in(guards)
-        str= "WatirSpec guards for this implementation: \n"
+        str = "WatirSpec guards for this implementation: \n"
 
         if gs.empty?
           "\tnone."
         else
           gs.each do |guard|
-            guard[:data][:file] = guard[:data][:file][/\/spec\/(.*):/, 1]
+            guard[:data][:file] = guard[:data][:file][%r{\/spec\/(.*):}, 1]
             guard_name = "#{guard[:name]}:".ljust(15)
             str << " \t#{guard_name} #{guard[:data].inspect}\n"
           end
@@ -30,26 +29,30 @@ module WatirSpec
     private
 
     def deviates_on(*impls)
-      Guards.record :deviates, impls, file: caller.first
+      Guards.record :deviates, impls, file: caller(1..1).first
       return yield if WatirSpec.unguarded?
+
       yield if WatirSpec.implementation.matches_guard?(impls)
     end
 
     def not_compliant_on(*impls)
-      Guards.record :not_compliant, impls, file: caller.first
+      Guards.record :not_compliant, impls, file: caller(1..1).first
       return yield if WatirSpec.unguarded?
+
       yield unless WatirSpec.implementation.matches_guard?(impls)
     end
 
     def compliant_on(*impls)
-      Guards.record :compliant, impls, file: caller.first
+      Guards.record :compliant, impls, file: caller(1..1).first
       return yield if WatirSpec.unguarded?
+
       yield if WatirSpec.implementation.matches_guard?(impls)
     end
 
     def bug(key, *impls)
-      Guards.record :bug, impls, file: caller.first, key: key
+      Guards.record :bug, impls, file: caller(1..1).first, key: key
       return yield if WatirSpec.unguarded?
+
       yield if impls.any? && !WatirSpec.implementation.matches_guard?(impls)
     end
   end

data/lib/watirspec/implementation.rb

@@ -1,6 +1,5 @@
 module WatirSpec
   class Implementation
-
     attr_writer :name, :guard_proc, :browser_class
     attr_accessor :browser_args
 
@@ -15,11 +14,11 @@ module WatirSpec
     end
 
     def browser_class
-      @browser_class || raise("browser_class not set")
+      @browser_class || raise('browser_class not set')
     end
 
     def name
-      @name || raise("implementation name not set")
+      @name || raise('implementation name not set')
     end
 
     def matches_guard?(args)
@@ -43,7 +42,7 @@ module WatirSpec
       return "#{string} default capabilities" unless desired_capabilities
 
       string << "\tcapabilities:\n"
-      caps.each { |k, v| string << "\t\t#{k}: #{v}\n"}
+      caps.each { |k, v| string << "\t\t#{k}: #{v}\n" }
       hash[:desired_capabilities] = desired_capabilities
       string
     end

data/lib/watirspec/rake_tasks.rb

@@ -16,7 +16,7 @@ module WatirSpec
         end
 
         desc 'Run WatirSpec examples'
-        task :run, %i(spec line) do |_, args|
+        task :run, %i[spec line] do |_, args|
           run(args)
         end
       end
@@ -43,7 +43,8 @@ module WatirSpec
 
     def run(**args)
       return if system(rspec_command(args))
-      exit $?.exitstatus || 1
+
+      exit $CHILD_STATUS.exitstatus || 1
     end
 
     def rspec_command(**args)
@@ -74,42 +75,42 @@ module WatirSpec
     end
 
     def watirspec_helper_template
-      <<-RUBY
-require 'watirspec'
-# require your gems
-
-WatirSpec.implementation do |watirspec|
-  # add WatirSpec implementation (see example below)
-  #
-  # watirspec.name = :watizzle
-  # watirspec.browser_class = Watir::Browser
-  # watirspec.browser_args = [:firefox, {}]
-  # watirspec.guard_proc = lambda do |args|
-  #   args.include?(:firefox)
-  # end
-end
+      <<~RUBY
+        require 'watirspec'
+        # require your gems
+
+        WatirSpec.implementation do |watirspec|
+          # add WatirSpec implementation (see example below)
+          #
+          # watirspec.name = :watizzle
+          # watirspec.browser_class = Watir::Browser
+          # watirspec.browser_args = [:firefox, {}]
+          # watirspec.guard_proc = lambda do |args|
+          #   args.include?(:firefox)
+          # end
+        end
 
-WatirSpec.run!
+        WatirSpec.run!
       RUBY
     end
 
     def print_usage
-      p <<-EOS
-File spec/watirspec_helper.rb is successfully created!
-Please, check it and customize for your needs. Once done, you can start using WatirSpec.
+      p <<~PRINT_USAGE
+        File spec/watirspec_helper.rb is successfully created!
+        Please, check it and customize for your needs. Once done, you can start using WatirSpec.
 
-Run all WatirSpec examples:
-  $ bundle exec rake watirspec:run
+        Run all WatirSpec examples:
+          $ bundle exec rake watirspec:run
 
-Run specific WatirSpec example:
-  $ bundle exec rake watirspec:run[elements/div]
+        Run specific WatirSpec example:
+          $ bundle exec rake watirspec:run[elements/div]
 
-Run WatirSpec example on a custom line:
-  $ bundle exec rake watirspec:run[elements/div, 50]
+        Run WatirSpec example on a custom line:
+          $ bundle exec rake watirspec:run[elements/div, 50]
 
-List all WatirSpec examples:
-  $ bundle exec rake watirspec:list
-      EOS
+        List all WatirSpec examples:
+          $ bundle exec rake watirspec:list
+      PRINT_USAGE
     end
   end
 end

data/lib/watirspec/remote_server.rb

@@ -24,7 +24,7 @@ module WatirSpec
 
       if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
         ENV['REMOTE_SERVER_BINARY']
-      elsif ENV['LOCAL_SELENIUM'] && File.exists?(local)
+      elsif ENV['LOCAL_SELENIUM'] && File.exist?(local)
         local
       elsif !Dir.glob('*selenium*.jar').empty?
         Dir.glob('*selenium*.jar').first
@@ -33,7 +33,7 @@ module WatirSpec
       end
     rescue SocketError
       # not connected to internet
-      raise Watir::Exception::Error, "unable to find or download selenium-server-standalone jar"
+      raise Watir::Exception::Error, 'unable to find or download selenium-server-standalone jar'
     end
   end
-end
+end

data/lib/watirspec/runner.rb

@@ -1,6 +1,5 @@
 module WatirSpec
   module Runner
-
     module BrowserHelper
       def browser
         $browser
@@ -52,8 +51,8 @@ module WatirSpec
 
     def add_guard_hook
       return if WatirSpec.unguarded?
+
       at_exit { WatirSpec::Guards.report }
     end
-
   end # Runner
 end # WatirSpec

data/lib/watirspec/server.rb

@@ -6,6 +6,7 @@ module WatirSpec
     class << self
       def run!
         return if running?
+
         Thread.new do
           run_server
           wait_for_connection
@@ -37,6 +38,7 @@ module WatirSpec
       def wait_for_connection
         socket_poller = Selenium::WebDriver::SocketPoller.new(bind, port, 30)
         return if socket_poller.connected?
+
         raise 'Cannot start WatirSpec server.'
       end
 
@@ -68,6 +70,7 @@ module WatirSpec
         headers = {}
         while (line = client.gets.split(' ', 2))
           break if line[0] == ''
+
           headers[line[0].chop] = line[1].strip
         end
 

data/lib/watirspec/server/app.rb

@@ -10,7 +10,19 @@ module WatirSpec
         when '/plain_text'
           respond('This is text/plain', 'Content-Type' => 'text/plain')
         when %r{/set_cookie}
-          respond("<html>C is for cookie, it's good enough for me</html>", 'Content-Type' => 'text/html', 'Set-Cookie' => 'monster=1')
+          body = "<html>C is for cookie, it's good enough for me</html>"
+          respond(body, 'Content-Type' => 'text/html', 'Set-Cookie' => 'monster=1')
+        when static_file?
+          respond_to_file(path)
+        else
+          respond('')
+        end
+      end
+
+      private
+
+      def respond_to_file(path)
+        case path
         when css_file?
           respond(file_read(path), 'Content-Type' => 'text/css')
         when js_file?
@@ -19,15 +31,11 @@ module WatirSpec
           respond(file_binread(path), 'Content-Type' => 'image/png')
         when gif_file?
           respond(file_read(path), 'Content-Type' => 'image/gif')
-        when static_file?
-          respond(file_read(path))
         else
-          respond('')
+          respond(file_read(path))
         end
       end
 
-      private
-
       def respond(body, headers = {}, status = '200 OK')
         [status, headers, body]
       end

data/spec/implementation_spec.rb

@@ -3,19 +3,19 @@ require 'watirspec_helper'
 describe WatirSpec::Implementation do
   before { @impl = WatirSpec::Implementation.new }
 
-  it "finds matching guards" do
+  it 'finds matching guards' do
     guards = {
       [:firefox] => [
-        {name: :not_compliant, data: {file: "./spec/watirspec/div_spec.rb:108"}},
-        {name: :deviates,      data: {file: "./spec/watirspec/div_spec.rb:114"}},
-        {name: :not_compliant, data: {file: "./spec/watirspec/div_spec.rb:200"}},
-        {name: :bug,           data: {file: "./spec/watirspec/div_spec.rb:228", key: "WTR-350"}}
+        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:108'}},
+        {name: :deviates,      data: {file: './spec/watirspec/div_spec.rb:114'}},
+        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:200'}},
+        {name: :bug,           data: {file: './spec/watirspec/div_spec.rb:228', key: 'WTR-350'}}
       ],
       [:chrome] => [
-        {name: :not_compliant, data: {file: "./spec/watirspec/div_spec.rb:109"}},
-        {name: :deviates,      data: {file: "./spec/watirspec/div_spec.rb:115"}},
-        {name: :not_compliant, data: {file: "./spec/watirspec/div_spec.rb:201"}},
-        {name: :bug,           data: {file: "./spec/watirspec/div_spec.rb:229", key: "WTR-349"}}
+        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:109'}},
+        {name: :deviates,      data: {file: './spec/watirspec/div_spec.rb:115'}},
+        {name: :not_compliant, data: {file: './spec/watirspec/div_spec.rb:201'}},
+        {name: :bug,           data: {file: './spec/watirspec/div_spec.rb:229', key: 'WTR-349'}}
       ]
     }
     @impl.name = :firefox

data/spec/locator_spec_helper.rb

@@ -34,9 +34,9 @@ module LocatorSpecHelper
     attrs = opts.delete(:attributes)
     el = double(Watir::HTMLElement, opts)
 
-    attrs.each do |key, value|
-      allow(el).to receive(:attribute).with(key).and_return(value)
-    end if attrs
+    attrs&.each do |key, value|
+      allow(el).to receive(:attribute).with(key.to_s).and_return(value)
+    end
     allow(el).to receive(:enabled?).and_return true
     el
   end
@@ -52,4 +52,3 @@ module LocatorSpecHelper
     end
   end
 end
-

data/spec/spec_helper.rb

@@ -9,14 +9,10 @@ require 'webdrivers'
 require 'locator_spec_helper'
 require 'rspec'
 
-SELENIUM_SELECTORS = %i(css tag_name xpath link_text partial_link_text link)
+SELENIUM_SELECTORS = %i[css tag_name xpath link_text partial_link_text link].freeze
 
-if ENV['RELAXED_LOCATE'] == "false"
-  Watir.relaxed_locate = false
-end
+Watir.relaxed_locate = false if ENV['RELAXED_LOCATE'] == 'false'
 
 ENV['DISPLAY'] = ':99.0' if ENV['TRAVIS']
 
-if Selenium::WebDriver::Platform.linux? && ENV['DISPLAY'].nil?
-  raise "DISPLAY not set"
-end
+raise 'DISPLAY not set' if Selenium::WebDriver::Platform.linux? && ENV['DISPLAY'].nil?

data/spec/unit/container_spec.rb

@@ -3,34 +3,33 @@ require_relative 'unit_helper'
 describe Watir::Container do
   before { @container = Object.new.extend(Watir::Container) }
 
-  describe "#extract_selector" do
+  describe '#extract_selector' do
     before do
       def @container.public_extract_selector(*args)
         extract_selector(*args)
       end
     end
 
-    it "converts 2-arg selector into a hash" do
+    it 'converts 2-arg selector into a hash' do
       expect {
         expect(@container.public_extract_selector([:how, 'what'])).to eq Hash[how: 'what']
       }.to have_deprecated_selector_parameters
     end
 
-    it "returns the hash given" do
-      expect(@container.public_extract_selector([how: "what"])).to eq Hash[how: "what"]
+    it 'returns the hash given' do
+      expect(@container.public_extract_selector([how: 'what'])).to eq Hash[how: 'what']
     end
 
-    it "returns an empty hash if given no args" do
+    it 'returns an empty hash if given no args' do
       expect(@container.public_extract_selector([])).to eq Hash[]
     end
 
-    it "raises ArgumentError if given 1 arg which is not a Hash" do
-      expect {@container.public_extract_selector([:how])}.to raise_error(ArgumentError)
+    it 'raises ArgumentError if given 1 arg which is not a Hash' do
+      expect { @container.public_extract_selector([:how]) }.to raise_error(ArgumentError)
     end
 
-    it "raises ArgumentError if given > 2 args" do
-      expect {@container.public_extract_selector([:how, 'what', 'value'])}.to raise_error(ArgumentError)
+    it 'raises ArgumentError if given > 2 args' do
+      expect { @container.public_extract_selector([:how, 'what', 'value']) }.to raise_error(ArgumentError)
     end
-
   end
 end