watir 6.17.0 → 7.0.0.beta2

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

@@ -0,0 +1,24 @@
+module Watir
+  module Locators
+    class Option
+      class Matcher < Element::Matcher
+        def fetch_value(element, how)
+          case how
+          when :any
+            [element.attribute(:value),
+             execute_js(:getTextContent, element).gsub(/\s+/, ' ').strip,
+             element.attribute(:label)]
+          else
+            super
+          end
+        end
+
+        def matches_values?(found, expected)
+          return super unless found.is_a?(Array)
+
+          found.find { |possible| matches_values?(possible, expected) }
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/option/selector_builder.rb

@@ -0,0 +1,8 @@
+module Watir
+  module Locators
+    class Option
+      class SelectorBuilder < Element::SelectorBuilder
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Watir
+  module Locators
+    class Option
+      class SelectorBuilder
+        class XPath < Element::SelectorBuilder::XPath
+          private
+
+          def attribute_string
+            result = if @selector.key?(:any)
+                       to_match = @selector.delete :any
+                       value = process_attribute(:value, to_match)
+                       text = process_attribute(:text, to_match)
+                       label = process_attribute(:label, to_match)
+                       "[#{value} or #{text} or #{label}]"
+                     else
+                       ''
+                     end
+
+            attributes = @selector.keys.map { |key|
+              process_attribute(key, @selector.delete(key))
+            }.flatten.compact
+            attribute_values = attributes.empty? ? '' : "[#{attributes.join(' and ')}]"
+            "#{result}#{attribute_values}"
+          end
+
+          def add_to_matching(key, regexp, results = nil)
+            return unless results.nil? || requires_matching?(results, regexp)
+
+            return super unless %i[value text label].include? key
+
+            @built[:any] = regexp
+          end
+        end
+      end
+    end
+  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
   #
@@ -16,100 +16,13 @@ module Watir
   #   Watir.logger.info('This is info message')
   #   Watir.logger.warn('This is warning message')
   #
-  class Logger
-    extend Forwardable
-    include ::Logger::Severity
-
-    def_delegators :@logger, :debug, :debug?,
-                   :info, :info?,
-                   :warn?,
-                   :error, :error?,
-                   :fatal, :fatal?,
-                   :level
-
-    def initialize(progname = 'Watir')
-      @logger = create_logger($stdout)
-      @logger.progname = progname
-      @ignored = []
-    end
-
-    def ignore(ids)
-      @ignored.concat Array(ids).map(&:to_s)
-    end
-
-    def output=(io)
-      @logger.reopen(io)
-    end
-
-    #
-    # Only log a warn message if it is not set to be ignored.
-    #
-    def warn(message, ids: [], &block)
-      msg = ids.empty? ? '' : "[#{ids.map!(&:to_s).map(&:inspect).join(', ')}] "
-      msg += message
-      @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.
-    #
-    # Normally, we would have never needed it, but we want to
-    # use it as IO object for all child processes to ensure their
-    # output is redirected there.
-    #
-    # It is only used in debug level, in other cases output is suppressed.
-    #
-    # @api private
-    #
-    def io
-      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-    end
-
-    #
-    # Marks code as deprecated with replacement.
-    #
-    # @param [String] old
-    # @param [String] new
-    #
-    def deprecate(old, new, reference: '', ids: [])
-      return if @ignored.include?('deprecations') || (@ignored & ids.map!(&:to_s)).any?
-
-      msg = ids.empty? ? '' : "[#{ids.map(&:inspect).join(', ')}] "
-      ref_msg = reference.empty? ? '.' : "; see explanation for this deprecation: #{reference}."
-      warn "[DEPRECATION] #{msg}#{old} is deprecated. Use #{new} instead#{ref_msg}"
+  class Logger < Selenium::WebDriver::Logger
+    def initialize
+      super('Watir')
     end
 
     def selenium=(val)
       Selenium::WebDriver.logger.level = val
     end
-
-    private
-
-    def create_logger(output)
-      logger = ::Logger.new(output)
-      logger.progname = 'Watir'
-      logger.level = ($DEBUG ? DEBUG : WARN)
-      logger.formatter = proc do |severity, time, progname, msg|
-        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
-      end
-
-      logger
-    end
   end
 end

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
 
@@ -139,6 +139,7 @@ module Watir
       end
       raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
     end
+    alias set select
 
     #
     # Returns true if any of the radio button label matches the given value.
@@ -201,7 +202,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)
@@ -218,8 +219,8 @@ module Watir
   end # RadioSet
 
   module Container
-    def radio_set(*args)
-      RadioSet.new(self, extract_selector(args).merge(tag_name: 'input', type: 'radio'))
+    def radio_set(opts = {})
+      RadioSet.new(self, opts.merge(tag_name: 'input', type: 'radio'))
     end
 
     Watir.tag_to_class[:radio_set] = RadioSet

data/lib/watir/row_container.rb

@@ -4,16 +4,16 @@ module Watir
     # Returns table row.
     #
 
-    def row(*args)
-      Row.new(self, extract_selector(args))
+    def row(opts)
+      Row.new(self, opts)
     end
 
     #
     # Returns table rows collection.
     #
 
-    def rows(*args)
-      RowCollection.new(self, extract_selector(args))
+    def rows(opts = {})
+      RowCollection.new(self, opts)
     end
 
     #

data/lib/watir/screenshot.rb

@@ -1,14 +1,8 @@
 module Watir
   class Screenshot
     def initialize(browser)
-      if browser.is_a? Selenium::WebDriver::Driver
-        msg = 'Initializing `Watir::Screenshot` with a `Selenium::Driver` instance', 'a `Watir::Browser` instance'
-        Watir.logger.deprecate msg, ids: [:screenshot_driver]
-        @driver = browser
-      else
-        @browser = browser
-        @driver = browser.wd
-      end
+      @browser = browser
+      @driver = browser.wd
     end
 
     #

data/lib/watir/user_editable.rb

@@ -14,9 +14,20 @@ module Watir
     end
     alias value= set
 
+    #
+    # Returns true if element is user_editable because it has a content_editable attribute set
+    #
+    # @return [Boolean]
+    #
+
+    def content_editable
+      defined?(@content_editable) && content_editable?
+    end
+
     #
     # Uses JavaScript to enter most of the given value.
     # Selenium is used to enter the first and last characters
+    # This might provide a performance improvement when entering a lot of text on a local machine
     #
     # @param [String, Symbol] args
     #
@@ -27,7 +38,7 @@ module Watir
 
       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 +54,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.17.0'.freeze
+  VERSION = '7.0.0.beta2'.freeze
 end

data/lib/watir/wait.rb

@@ -32,12 +32,7 @@ module Watir
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def until(depr_timeout = nil, depr_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
-        if depr_message || depr_timeout
-          Watir.logger.deprecate 'Using arguments for Wait#until', 'keywords', ids: %i[until timeout_arguments]
-          timeout = depr_timeout
-          message = depr_message
-        end
+      def until(timeout: nil, message: nil, interval: nil, object: nil)
         timeout ||= Watir.default_timeout
         run_with_timer(timeout, interval) do
           result = yield(object)
@@ -58,12 +53,7 @@ module Watir
       # @raise [TimeoutError] if timeout is exceeded
       #
 
-      def while(depr_timeout = nil, depr_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
-        if depr_message || depr_timeout
-          Watir.logger.deprecate 'Using arguments for Wait#while', 'keywords', ids: %i[while timeout_arguments]
-          timeout = depr_timeout
-          message = depr_message
-        end
+      def while(timeout: nil, message: nil, interval: nil, object: nil)
         timeout ||= Watir.default_timeout
         run_with_timer(timeout, interval) { return unless yield(object) }
         raise TimeoutError, message_for(timeout, object, message)
@@ -111,12 +101,7 @@ module Watir
     # @param [String] message error message for when times out
     #
 
-    def wait_until(depr_timeout = nil, depr_message = nil, timeout: nil, message: nil, interval: nil, **opt, &blk)
-      if depr_message || depr_timeout
-        Watir.logger.deprecate 'Using arguments for #wait_until', 'keywords', ids: [:timeout_arguments]
-        timeout = depr_timeout
-        message = depr_message
-      end
+    def wait_until(timeout: nil, message: nil, interval: nil, **opt, &blk)
       message ||= proc { |obj| "waiting for true condition on #{obj.inspect}" }
 
       # TODO: Consider throwing argument error for mixing block & options
@@ -142,12 +127,7 @@ module Watir
     # @param [String] message error message for when times out
     #
 
-    def wait_while(depr_timeout = nil, depr_message = nil, timeout: nil, message: nil, interval: nil, **opt, &blk)
-      if depr_message || depr_timeout
-        Watir.logger.deprecate 'Using arguments for #wait_while', 'keywords', ids: [:timeout_arguments]
-        timeout = depr_timeout
-        message = depr_message
-      end
+    def wait_while(timeout: nil, message: nil, interval: nil, **opt, &blk)
       message ||= proc { |obj| "waiting for false condition on #{obj.inspect}" }
 
       # TODO: Consider throwing argument error for mixing block & options
@@ -158,56 +138,6 @@ module Watir
       self
     end
 
-    #
-    # Waits until the element is present.
-    # Element is always relocated, so this can be used in the case of an element going away and returning
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").wait_until_present
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    # @param [Float] interval seconds to wait before each try
-    # @param [String] message error message for when times out
-    #
-    # @see Watir::Wait
-    # @see Watir::Element#present?
-    #
-
-    def wait_until_present(depr_timeout = nil, timeout: nil, interval: nil, message: nil)
-      timeout = depr_timeout if depr_timeout
-      Watir.logger.deprecate "#{self.class}#wait_until_present",
-                             "#{self.class}#wait_until(&:present?)",
-                             ids: [:wait_until_present]
-
-      message ||= proc { |obj| "waiting for #{obj.inspect} to become present" }
-      wait_until(timeout: timeout, interval: interval, message: message, element_reset: true, &:present?)
-    end
-
-    #
-    # Waits while the element is present.
-    # Element is always relocated, so this can be used in the case of the element changing attributes
-    #
-    # @example
-    #   browser.text_field(name: "abrakadbra").wait_while_present
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    # @param [Float] interval seconds to wait before each try
-    # @param [String] message error message for when times out
-    #
-    # @see Watir::Wait
-    # @see Watir::Element#present?
-    #
-
-    def wait_while_present(depr_timeout = nil, timeout: nil, interval: nil, message: nil)
-      timeout = depr_timeout if depr_timeout
-      Watir.logger.deprecate "#{self.class}#wait_while_present",
-                             "#{self.class}#wait_while(&:present?)",
-                             ids: [:wait_while_present]
-
-      message ||= proc { |obj| "waiting for #{obj.inspect} not to be present" }
-      wait_while(timeout: timeout, interval: interval, message: message, element_reset: true, &:present?)
-    end
-
     private
 
     def create_proc(opt)
@@ -229,6 +159,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

@@ -1,12 +1,11 @@
 module Watir
   class Window
-    include EventuallyPresent
     include Waitable
     include Exception
 
     attr_reader :browser
 
-    def initialize(browser, selector)
+    def initialize(browser, selector = {})
       @browser = browser
       @driver = browser.driver
       @selector = selector
@@ -16,7 +15,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 element].include? k }
 
         raise ArgumentError, "invalid window selector: #{selector_string}"
       end
@@ -113,7 +112,7 @@ module Watir
     # Returns true if two windows are equal.
     #
     # @example
-    #   browser.window(index: 0) == browser.window(index: 1)
+    #   browser.window(title: /window_switching/) == browser.window(/closeable/)
     #   #=> false
     #
     # @param [Window] other
@@ -180,18 +179,27 @@ module Watir
     #   end
     #
 
-    def use(&blk)
-      @browser.original_window ||= current_window
+    def use
       wait_for_exists
-      @driver.switch_to.window(handle, &blk)
+      cache_current = current_window
+      @browser.original_window ||= cache_current
+      restore_to = unless cache_current == handle
+                     @driver.switch_to.window(handle)
+                     cache_current
+                   end
+      if block_given?
+        begin
+          yield
+        ensure
+          @driver.switch_to.window(restore_to) if restore_to
+        end
+      end
       self
     end
 
     #
     # @api private
     #
-    # Referenced in EventuallyPresent
-    #
 
     def selector_string
       @selector.inspect
@@ -204,17 +212,11 @@ module Watir
     private
 
     def locate
-      if @selector.empty?
-        nil
-      elsif @selector.key?(:index)
-        @driver.window_handles[Integer(@selector[:index])]
-      else
-        @driver.window_handles.find { |wh| matches?(wh) }
-      end
+      @selector.empty? ? nil : @driver.window_handles.find { |wh| matches?(wh) }
     end
 
     def assert_exists
-      return if @driver.window_handles.include?(handle)
+      return if !handle.nil? && @driver.window_handles.include?(handle)
 
       raise(NoMatchingWindowFoundException, selector_string)
     end
@@ -230,8 +232,9 @@ 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
       # the window may disappear while we're iterating.
@@ -239,13 +242,9 @@ module Watir
     end
 
     def wait_for_exists
-      return assert_exists unless Watir.relaxed_locate?
-
-      begin
-        wait_until(&:exists?)
-      rescue Wait::TimeoutError
-        raise NoMatchingWindowFoundException, selector_string
-      end
+      wait_until(&:exists?)
+    rescue Wait::TimeoutError
+      raise NoMatchingWindowFoundException, selector_string
     end
   end # Window
 end # Watir