watir 6.10.1 → 6.10.2

data/lib/watir/xpath_support.rb

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

data/lib/watirspec.rb

@@ -1,86 +1,86 @@
-require "tmpdir"
-require 'watirspec/guards'
-require 'watirspec/implementation'
-require 'watirspec/runner'
-require 'watirspec/server'
-
-module WatirSpec
-  class << self
-    attr_accessor :browser_args, :unguarded, :implementation
-
-    def htmls
-      @htmls ||= [File.expand_path("../../spec/watirspec/html", __FILE__)]
-    end
-
-    def run!
-      load_support
-      WatirSpec::Runner.execute_if_necessary
-    end
-
-    def url_for(str)
-      File.join(host, str)
-    end
-
-    def host
-      @host ||= "http://#{Server.bind}:#{Server.port}"
-    end
-
-    def unguarded?
-      @unguarded ||= false
-    end
-
-    def load_support
-      root = File.expand_path("../../spec/watirspec", __FILE__)
-      Dir.glob("#{root}/support/**/*.rb").each do |file|
-        require file
-      end
-    end
-
-    def implementation
-      @implementation ||= (
-        imp = WatirSpec::Implementation.new
-        yield imp if block_given?
-
-        imp
-      )
-    end
-
-    def implementation=(imp)
-      unless imp.is_a?(WatirSpec::Implementation)
-        raise TypeError, "expected WatirSpec::Implementation, got #{imp.class}"
-      end
-
-      @implementation = imp
-    end
-
-    def new_browser
-      klass = WatirSpec.implementation.browser_class
-      args = Array(WatirSpec.implementation.browser_args).map { |e| Hash === e ? e.dup : e }
-
-      instance = klass.new(*args)
-      print_browser_info_once(instance)
-
-      instance
-    end
-
-    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}"
-
-      Watir.logger.warn "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}"
-    rescue
-      # ignored
-    end
-
-  end # class << WatirSpec
-end # WatirSpec
+require "tmpdir"
+require 'watirspec/guards'
+require 'watirspec/implementation'
+require 'watirspec/runner'
+require 'watirspec/server'
+
+module WatirSpec
+  class << self
+    attr_accessor :browser_args, :unguarded, :implementation
+
+    def htmls
+      @htmls ||= [File.expand_path("../../spec/watirspec/html", __FILE__)]
+    end
+
+    def run!
+      load_support
+      WatirSpec::Runner.execute_if_necessary
+    end
+
+    def url_for(str)
+      File.join(host, str)
+    end
+
+    def host
+      @host ||= "http://#{Server.bind}:#{Server.port}"
+    end
+
+    def unguarded?
+      @unguarded ||= false
+    end
+
+    def load_support
+      root = File.expand_path("../../spec/watirspec", __FILE__)
+      Dir.glob("#{root}/support/**/*.rb").each do |file|
+        require file
+      end
+    end
+
+    def implementation
+      @implementation ||= (
+        imp = WatirSpec::Implementation.new
+        yield imp if block_given?
+
+        imp
+      )
+    end
+
+    def implementation=(imp)
+      unless imp.is_a?(WatirSpec::Implementation)
+        raise TypeError, "expected WatirSpec::Implementation, got #{imp.class}"
+      end
+
+      @implementation = imp
+    end
+
+    def new_browser
+      klass = WatirSpec.implementation.browser_class
+      args = Array(WatirSpec.implementation.browser_args).map { |e| Hash === e ? e.dup : e }
+
+      instance = klass.new(*args)
+      print_browser_info_once(instance)
+
+      instance
+    end
+
+    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}"
+
+      Watir.logger.warn "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}"
+    rescue
+      # ignored
+    end
+
+  end # class << WatirSpec
+end # WatirSpec

data/lib/watirspec/guards.rb

@@ -1,60 +1,60 @@
-module WatirSpec
-  module Guards
-
-    class << self
-      def guards
-        @guards ||= Hash.new { |hash, key| hash[key] = [] }
-      end
-
-      def record(guard_name, impls, data)
-        guards[impls] << {name: guard_name, data: data}
-      end
-
-      def report
-        gs = WatirSpec.implementation.matching_guards_in(guards)
-        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_name = "#{guard[:name]}:".ljust(15)
-            str << " \t#{guard_name} #{guard[:data].inspect}\n"
-          end
-          Watir.logger.warn str
-        end
-      end
-    end # class << self
-
-    private
-
-    def deviates_on(*impls)
-      Guards.record :deviates, impls, file: caller.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
-      return yield if WatirSpec.unguarded?
-      yield unless WatirSpec.implementation.matches_guard?(impls)
-    end
-
-    def compliant_on(*impls)
-      Guards.record :compliant, impls, file: caller.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
-      return yield if WatirSpec.unguarded?
-      yield if impls.any? && !WatirSpec.implementation.matches_guard?(impls)
-    end
-  end
-end
-
-class Object
-  include WatirSpec::Guards
-end
+module WatirSpec
+  module Guards
+
+    class << self
+      def guards
+        @guards ||= Hash.new { |hash, key| hash[key] = [] }
+      end
+
+      def record(guard_name, impls, data)
+        guards[impls] << {name: guard_name, data: data}
+      end
+
+      def report
+        gs = WatirSpec.implementation.matching_guards_in(guards)
+        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_name = "#{guard[:name]}:".ljust(15)
+            str << " \t#{guard_name} #{guard[:data].inspect}\n"
+          end
+          Watir.logger.warn str
+        end
+      end
+    end # class << self
+
+    private
+
+    def deviates_on(*impls)
+      Guards.record :deviates, impls, file: caller.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
+      return yield if WatirSpec.unguarded?
+      yield unless WatirSpec.implementation.matches_guard?(impls)
+    end
+
+    def compliant_on(*impls)
+      Guards.record :compliant, impls, file: caller.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
+      return yield if WatirSpec.unguarded?
+      yield if impls.any? && !WatirSpec.implementation.matches_guard?(impls)
+    end
+  end
+end
+
+class Object
+  include WatirSpec::Guards
+end

data/lib/watirspec/implementation.rb

@@ -1,51 +1,51 @@
-module WatirSpec
-  class Implementation
-
-    attr_writer :name, :guard_proc, :browser_class
-    attr_accessor :browser_args
-
-    def initialize
-      @guard_proc = nil
-    end
-
-    def initialize_copy(orig)
-      super
-      # Backward compatibility < Ruby 2.4
-      @browser_args = browser_args.map { |arg| arg.is_a?(Symbol) ? arg : arg.dup }
-    end
-
-    def browser_class
-      @browser_class || raise("browser_class not set")
-    end
-
-    def name
-      @name || raise("implementation name not set")
-    end
-
-    def matches_guard?(args)
-      return @guard_proc.call(args) if @guard_proc
-
-      args.include? name
-    end
-
-    def matching_guards_in(guards)
-      result = []
-      guards.each { |args, data| data.each { |d| result << d } if args.empty? || matches_guard?(args) }
-
-      result
-    end
-
-    def inspect_args
-      hash = browser_args.last
-      desired_capabilities = hash.delete(:desired_capabilities)
-      string = ''
-      hash.each { |arg| string << "#{arg.inspect}\n" }
-      return "#{string} default capabilities" unless desired_capabilities
-
-      string << "\tcapabilities:\n"
-      caps.each { |k, v| string << "\t\t#{k}: #{v}\n"}
-      hash[:desired_capabilities] = desired_capabilities
-      string
-    end
-  end # Implementation
-end # WatirSpec
+module WatirSpec
+  class Implementation
+
+    attr_writer :name, :guard_proc, :browser_class
+    attr_accessor :browser_args
+
+    def initialize
+      @guard_proc = nil
+    end
+
+    def initialize_copy(orig)
+      super
+      # Backward compatibility < Ruby 2.4
+      @browser_args = browser_args.map { |arg| arg.is_a?(Symbol) ? arg : arg.dup }
+    end
+
+    def browser_class
+      @browser_class || raise("browser_class not set")
+    end
+
+    def name
+      @name || raise("implementation name not set")
+    end
+
+    def matches_guard?(args)
+      return @guard_proc.call(args) if @guard_proc
+
+      args.include? name
+    end
+
+    def matching_guards_in(guards)
+      result = []
+      guards.each { |args, data| data.each { |d| result << d } if args.empty? || matches_guard?(args) }
+
+      result
+    end
+
+    def inspect_args
+      hash = browser_args.last
+      desired_capabilities = hash.delete(:desired_capabilities)
+      string = ''
+      hash.each { |arg| string << "#{arg.inspect}\n" }
+      return "#{string} default capabilities" unless desired_capabilities
+
+      string << "\tcapabilities:\n"
+      caps.each { |k, v| string << "\t\t#{k}: #{v}\n"}
+      hash[:desired_capabilities] = desired_capabilities
+      string
+    end
+  end # Implementation
+end # WatirSpec

data/lib/watirspec/rake_tasks.rb

@@ -1,115 +1,115 @@
-require 'rake/tasklib'
-
-module WatirSpec
-  class RakeTasks < Rake::TaskLib
-    def initialize
-      namespace :watirspec do
-        desc 'Initialize WatirSpec'
-        task :init do
-          init_watirspec
-          print_usage
-        end
-
-        desc 'List WatirSpec examples'
-        task :list do
-          print_specs
-        end
-
-        desc 'Run WatirSpec examples'
-        task :run, %i(spec line) do |_, args|
-          run(args)
-        end
-      end
-    end
-
-    private
-
-    def init_watirspec
-      Dir.mkdir('spec') unless Dir.exist?('spec')
-      return if File.exist?('spec/watirspec_helper.rb')
-
-      File.open('spec/watirspec_helper.rb', 'w') do |file|
-        file.write(watirspec_helper_template)
-      end
-    end
-
-    def print_specs
-      puts "The following spec files are present:\n\n"
-      spec_files.each do |file|
-        filename = file.sub("#{watirspec_path}/", '')
-        puts "  #{filename}"
-      end
-    end
-
-    def run(**args)
-      return if system(rspec_command(args))
-      exit $?.exitstatus || 1
-    end
-
-    def rspec_command(**args)
-      cmd = [rspec_binary]
-      if args[:spec]
-        spec_file = spec_files.find { |file| file == "#{watirspec_path}/#{args[:spec]}_spec.rb" }
-        spec_file << ":#{args[:line]}" if args[:line]
-        cmd << spec_file
-      else
-        cmd << spec_files
-      end
-
-      cmd.join(' ')
-    end
-
-    def spec_files
-      Dir.glob("#{watirspec_path}/**/*_spec.rb")
-    end
-
-    def rspec_binary
-      rspec_path = Bundler.rubygems.find_name('rspec-core').first.full_gem_path
-      "#{rspec_path}/exe/rspec"
-    end
-
-    def watirspec_path
-      watir_path = Bundler.rubygems.find_name('watir').first.full_gem_path
-      "#{watir_path}/spec/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
-
-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.
-
-Run all WatirSpec examples:
-  $ bundle exec rake watirspec:run
-
-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]
-
-List all WatirSpec examples:
-  $ bundle exec rake watirspec:list
-      EOS
-    end
-  end
-end
+require 'rake/tasklib'
+
+module WatirSpec
+  class RakeTasks < Rake::TaskLib
+    def initialize
+      namespace :watirspec do
+        desc 'Initialize WatirSpec'
+        task :init do
+          init_watirspec
+          print_usage
+        end
+
+        desc 'List WatirSpec examples'
+        task :list do
+          print_specs
+        end
+
+        desc 'Run WatirSpec examples'
+        task :run, %i(spec line) do |_, args|
+          run(args)
+        end
+      end
+    end
+
+    private
+
+    def init_watirspec
+      Dir.mkdir('spec') unless Dir.exist?('spec')
+      return if File.exist?('spec/watirspec_helper.rb')
+
+      File.open('spec/watirspec_helper.rb', 'w') do |file|
+        file.write(watirspec_helper_template)
+      end
+    end
+
+    def print_specs
+      puts "The following spec files are present:\n\n"
+      spec_files.each do |file|
+        filename = file.sub("#{watirspec_path}/", '')
+        puts "  #{filename}"
+      end
+    end
+
+    def run(**args)
+      return if system(rspec_command(args))
+      exit $?.exitstatus || 1
+    end
+
+    def rspec_command(**args)
+      cmd = [rspec_binary]
+      if args[:spec]
+        spec_file = spec_files.find { |file| file == "#{watirspec_path}/#{args[:spec]}_spec.rb" }
+        spec_file << ":#{args[:line]}" if args[:line]
+        cmd << spec_file
+      else
+        cmd << spec_files
+      end
+
+      cmd.join(' ')
+    end
+
+    def spec_files
+      Dir.glob("#{watirspec_path}/**/*_spec.rb")
+    end
+
+    def rspec_binary
+      rspec_path = Bundler.rubygems.find_name('rspec-core').first.full_gem_path
+      "#{rspec_path}/exe/rspec"
+    end
+
+    def watirspec_path
+      watir_path = Bundler.rubygems.find_name('watir').first.full_gem_path
+      "#{watir_path}/spec/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
+
+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.
+
+Run all WatirSpec examples:
+  $ bundle exec rake watirspec:run
+
+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]
+
+List all WatirSpec examples:
+  $ bundle exec rake watirspec:list
+      EOS
+    end
+  end
+end