watir 6.16.2 → 6.18.0

data/lib/watir/locators/text_field/matcher.rb

@@ -5,7 +5,7 @@ module Watir
         private
 
         def elements_match?(element, values_to_match)
-          case element.tag_name.downcase
+          case fetch_value(element, :tag_name)
           when 'input'
             %i[text label visible_text].each do |key|
               next unless values_to_match.key?(key)

data/lib/watir/locators/text_field/selector_builder/xpath.rb

@@ -36,7 +36,9 @@ module Watir
 
           def negative_type_text
             Watir::TextField::NON_TEXT_TYPES.map { |type|
-              "#{lhs_for(:type, true)}!=#{SelectorBuilder::XpathSupport.escape type}"
+              lhs = lhs_for(:type, downcase: true)
+              rhs = SelectorBuilder::XpathSupport.downcase(SelectorBuilder::XpathSupport.escape(type))
+              "#{lhs}!=#{rhs}"
             }.join(' and ')
           end
         end

data/lib/watir/logger.rb

@@ -2,7 +2,7 @@ require 'forwardable'
 require 'logger'
 
 # Code adapted from Selenium Implementation
-# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
+# https://github.com/SeleniumHQ/selenium/blob/trunk/rb/lib/selenium/webdriver/common/logger.rb
 
 module Watir
   #
@@ -25,7 +25,7 @@ module Watir
                    :warn?,
                    :error, :error?,
                    :fatal, :fatal?,
-                   :level
+                   :level, :level=
 
     def initialize(progname = 'Watir')
       @logger = create_logger($stdout)
@@ -34,8 +34,7 @@ module Watir
     end
 
     def ignore(ids)
-      ids = [ids] unless ids.is_a? Array
-      @ignored.concat ids.map(&:to_s)
+      @ignored.concat Array(ids).map(&:to_s)
     end
 
     def output=(io)
@@ -51,22 +50,6 @@ module Watir
       @logger.warn(msg, &block) unless (@ignored & ids).any?
     end
 
-    #
-    # For Ruby < 2.4 compatibility
-    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
-    #
-
-    def level=(severity)
-      if severity.is_a?(Integer)
-        @logger.level = severity
-      else
-        levels = %w[debug info warn error fatal unknown]
-        raise ArgumentError, "invalid log level: #{severity}" unless levels.include? severity.to_s.downcase
-
-        @logger.level = severity.to_s.upcase
-      end
-    end
-
     #
     # Returns IO object used by logger internally.
     #
@@ -96,6 +79,10 @@ module Watir
       warn "[DEPRECATION] #{msg}#{old} is deprecated. Use #{new} instead#{ref_msg}"
     end
 
+    def selenium=(val)
+      Selenium::WebDriver.logger.level = val
+    end
+
     private
 
     def create_logger(output)

data/lib/watir/radio_set.rb

@@ -4,7 +4,7 @@ module Watir
     include Exception
     include Enumerable
 
-    delegate %i[exists? present? visible? browser] => :source
+    delegate %i[exist? exists? present? visible? browser] => :source
 
     attr_reader :source, :frame
 
@@ -201,7 +201,7 @@ module Watir
     end
     alias eql? ==
 
-    # Ruby 2.4+ complains about using #delegate to do this
+    # Delegating to Private Methods
     %i[assert_exists element_call].each do |method|
       define_method(method) do |*args, &blk|
         source.send(method, *args, &blk)

data/lib/watir/user_editable.rb

@@ -21,13 +21,17 @@ module Watir
     # @param [String, Symbol] args
     #
 
+    def content_editable
+      defined?(@content_editable) && content_editable?
+    end
+
     def set!(*args)
       msg = '#set! does not support special keys, use #set instead'
       raise ArgumentError, msg if args.any? { |v| v.is_a?(::Symbol) }
 
       input_value = args.join
       set input_value[0]
-      return content_editable_set!(*args) if @content_editable
+      return content_editable_set!(*args) if content_editable
 
       element_call { execute_js(:setValue, @element, input_value[0..-2]) }
       append(input_value[-1])
@@ -43,7 +47,7 @@ module Watir
     #
 
     def append(*args)
-      raise NotImplementedError, '#append method is not supported with contenteditable element' if @content_editable
+      raise NotImplementedError, '#append method is not supported with contenteditable element' if content_editable
 
       send_keys(*args)
     end

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '6.16.2'.freeze
+  VERSION = '6.18.0'.freeze
 end

data/lib/watir/wait.rb

@@ -229,6 +229,8 @@ module Watir
           case expected
           when Regexp
             expected =~ actual
+          when Numeric
+            expected == actual
           else
             expected.to_s == actual
           end

data/lib/watir/wait/timer.rb

@@ -2,7 +2,7 @@ module Watir
   module Wait
     class Timer
       def initialize(timeout: nil)
-        @end_time = current_time + timeout if timeout
+        @end_time = timeout ? current_time + timeout : nil
         @remaining_time = @end_time - current_time if @end_time
       end
 

data/lib/watir/window.rb

@@ -6,7 +6,7 @@ module Watir
 
     attr_reader :browser
 
-    def initialize(browser, selector)
+    def initialize(browser, selector = {})
       @browser = browser
       @driver = browser.driver
       @selector = selector
@@ -16,7 +16,7 @@ module Watir
       elsif selector.key? :handle
         @handle = selector.delete :handle
       else
-        return if selector.keys.all? { |k| %i[title url index].include? k }
+        return if selector.keys.all? { |k| %i[title url index element].include? k }
 
         raise ArgumentError, "invalid window selector: #{selector_string}"
       end
@@ -207,6 +207,9 @@ module Watir
       if @selector.empty?
         nil
       elsif @selector.key?(:index)
+        Watir.logger.deprecate 'Using :index as a selector for Window', ':title or :url or :element',
+                               reference: 'http://watir.com/guides/windows/#locating-by-index-is-no-longer-supported',
+                               ids: [:window_index]
         @driver.window_handles[Integer(@selector[:index])]
       else
         @driver.window_handles.find { |wh| matches?(wh) }
@@ -230,10 +233,11 @@ module Watir
       @driver.switch_to.window(handle) do
         matches_title = @selector[:title].nil? || @browser.title =~ /#{@selector[:title]}/
         matches_url = @selector[:url].nil? || @browser.url =~ /#{@selector[:url]}/
+        matches_element = @selector[:element].nil? || @selector[:element].exists?
 
-        matches_title && matches_url
+        matches_title && matches_url && matches_element
       end
-    rescue Selenium::WebDriver::Error::NoSuchWindowError, Selenium::WebDriver::Error::NoSuchDriverError
+    rescue Selenium::WebDriver::Error::NoSuchWindowError
       # the window may disappear while we're iterating.
       false
     end

data/lib/watir/window_collection.rb

@@ -0,0 +1,105 @@
+module Watir
+  class WindowCollection
+    include Enumerable
+    include Waitable
+
+    def initialize(browser, selector = {})
+      unless selector.keys.all? { |k| %i[title url element].include? k }
+        raise ArgumentError, "invalid window selector: #{selector.inspect}"
+      end
+
+      @browser = browser
+      @selector = selector
+    end
+
+    #
+    # Yields each window in collection.
+    #
+    # @yieldparam [Watir::Window]
+    #
+
+    def each(&blk)
+      reset!
+      to_a.each(&blk)
+    end
+
+    alias length count
+    alias size count
+    alias empty? none?
+
+    #
+    # First window of the collection
+    #
+    # @note windows in a collection are not ordered so this is not reliably
+    # @deprecated use Browser#switch_window or a better Window locator
+    # @return [Watir::Window] Returns an instance of a Watir::Window
+    #
+
+    def first
+      self[0]
+    end
+
+    #
+    # Last window of the collection
+    #
+    # @note windows in a collection are not ordered so this is not reliably
+    # @deprecated use Browser#switch_window or a better Window locator
+    # @return [Watir::Window] Returns an instance of a Watir::Window
+    #
+
+    def last
+      self[-1]
+    end
+
+    #
+    # Get the window at the given index or range.
+    #
+    # @note windows in a collection are not ordered so this is not reliably
+    # @deprecated use Browser#switch_window or a better Window locator
+    # @param [Integer, Range] value Index (0-based) or Range of desired window(s)
+    # @return [Watir::Window] Returns an instance of a Watir::Window
+    #
+
+    def [](value)
+      old = 'using indexing with windows'
+      new = 'Browser#switch_window or Browser#window with :title, :url or :element selectors'
+      reference = 'http://watir.com/window_indexes'
+      Watir.logger.deprecate old, new, reference: reference, ids: [:window_index]
+
+      to_a[value]
+    end
+
+    def ==(other)
+      to_a == other.to_a
+    end
+    alias eql? ==
+
+    def to_a
+      @to_a ||= begin
+        handles = @browser.driver.window_handles.select { |wh| matches?(wh) }
+        handles.map { |wh| Window.new(@browser, handle: wh) }
+      end
+    end
+
+    def reset!
+      @to_a = nil
+    end
+
+    private
+
+    # NOTE: This is the exact same code from `Window#matches?`
+    # TODO: Move this code into a separate WindowLocator class
+    def matches?(handle)
+      @selector.empty? || @browser.driver.switch_to.window(handle) do
+        matches_title = @selector[:title].nil? || @browser.title =~ /#{@selector[:title]}/
+        matches_url = @selector[:url].nil? || @browser.url =~ /#{@selector[:url]}/
+        matches_element = @selector[:element].nil? || @selector[:element].exists?
+
+        matches_title && matches_url && matches_element
+      end
+    rescue Selenium::WebDriver::Error::NoSuchWindowError
+      # the window may disappear while we're iterating.
+      false
+    end
+  end # Window
+end # Watir

data/lib/watirspec.rb

@@ -31,7 +31,7 @@ module WatirSpec
 
     def load_support
       root = File.expand_path('../spec/watirspec', __dir__)
-      Dir.glob("#{root}/support/**/*.rb").each do |file|
+      Dir.glob("#{root}/support/**/*.rb").sort.each do |file|
         require file
       end
     end
@@ -77,6 +77,7 @@ module WatirSpec
 
       info << caps.browser_name.to_s
       info << caps.version.to_s
+      info << @implementation.driver_info
 
       Watir.logger.warn "running watirspec against #{info.join ' '} using:\n#{WatirSpec.implementation.inspect_args}",
                         ids: [:browser_info]

data/lib/watirspec/guards.rb

@@ -17,7 +17,7 @@ module WatirSpec
           "\tnone."
         else
           gs.each do |guard|
-            guard[:data][:file] = guard[:data][:file][%r{\/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

data/lib/watirspec/implementation.rb

@@ -1,16 +1,14 @@
 module WatirSpec
   class Implementation
     attr_writer :name, :guard_proc, :browser_class
-    attr_accessor :browser_args
+    attr_accessor :browser_args, :driver_info
 
     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 }
+    def initialize_copy(_orig)
+      @browser_args = browser_args.map(&:dup)
     end
 
     def browser_class

data/lib/watirspec/rake_tasks.rb

@@ -3,6 +3,8 @@ require 'rake/tasklib'
 module WatirSpec
   class RakeTasks < Rake::TaskLib
     def initialize
+      super
+
       namespace :watirspec do
         desc 'Initialize WatirSpec'
         task :init do

data/lib/watirspec/runner.rb

@@ -10,6 +10,10 @@ module WatirSpec
       def messages
         browser.div(id: 'messages').divs.map(&:text)
       end
+
+      def event_log
+        browser.div(id: 'log').wait_until(&:present?).ps.map(&:text)
+      end
     end
 
     module_function
@@ -29,7 +33,7 @@ module WatirSpec
     end
 
     def execute_if_necessary
-      execute if !@executed && @execute
+      execute if (!defined?(@executed) || !@executed) && @execute
     end
 
     def configure

data/lib/watirspec/server.rb

@@ -24,7 +24,7 @@ module WatirSpec
       private
 
       def running?
-        @running
+        defined?(@running) && @running
       end
 
       def run_server

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-if ENV['TRAVIS'] || ENV['COVERAGE']
+if ENV['GITHUB_ACTIONS'] || ENV['COVERAGE']
   require 'coveralls'
   require 'simplecov'
   require 'simplecov-console'
@@ -19,11 +19,10 @@ if ENV['TRAVIS'] || ENV['COVERAGE']
 end
 
 require 'watir'
-require 'webdrivers'
 require 'locator_spec_helper'
 require 'rspec'
 
-if ENV['TRAVIS']
+if ENV['GITHUB_ACTIONS']
   require 'rspec/retry'
   RSpec.configure do |config|
     config.verbose_retry = true
@@ -36,7 +35,3 @@ end
 SELENIUM_SELECTORS = %i[css tag_name xpath link_text partial_link_text link].freeze
 
 Watir.relaxed_locate = false if ENV['RELAXED_LOCATE'] == 'false'
-
-ENV['DISPLAY'] = ':99.0' if ENV['TRAVIS']
-
-raise 'DISPLAY not set' if Selenium::WebDriver::Platform.linux? && ENV['DISPLAY'].nil?

data/spec/unit/container_spec.rb

@@ -17,7 +17,7 @@ describe Watir::Container do
     end
 
     it 'returns the hash given' do
-      expect(@container.public_extract_selector([how: 'what'])).to eq Hash[how: 'what']
+      expect(@container.public_extract_selector([{how: 'what'}])).to eq Hash[how: 'what']
     end
 
     it 'returns an empty hash if given no args' do

data/spec/unit/logger_spec.rb

@@ -34,13 +34,11 @@ module Watir
     end
 
     it 'allows to output to file' do
-      begin
-        Watir.logger.output = 'test.log'
-        Watir.logger.warn('message')
-        expect(File.read('test.log')).to include('WARN Watir message')
-      ensure
-        File.delete('test.log')
-      end
+      Watir.logger.output = 'test.log'
+      Watir.logger.warn('message')
+      expect(File.read('test.log')).to include('WARN Watir message')
+    ensure
+      File.delete('test.log')
     end
 
     it 'allows to deprecate functionality' do