watir 6.13.0 → 6.14.0

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

@@ -9,16 +9,15 @@ module Watir
 
           def build(selectors)
             adjacent = selectors.delete :adjacent
-            xpath = adjacent ? process_adjacent(adjacent) : ".//"
+            xpath = adjacent ? process_adjacent(adjacent) : './/*'
 
-            xpath << (selectors.delete(:tag_name) || '*').to_s
+            tag_name = selectors.delete(:tag_name).to_s
+            xpath << "[local-name()='#{tag_name}']" unless tag_name.empty?
 
             index = selectors.delete(:index)
 
             # the remaining entries should be attributes
-            unless selectors.empty?
-              xpath << "[" << attribute_expression(nil, selectors) << "]"
-            end
+            xpath << '[' << attribute_expression(nil, selectors) << ']' unless selectors.empty?
 
             xpath << "[#{index + 1}]" if adjacent && index
 
@@ -31,27 +30,28 @@ module Watir
           def attribute_expression(building, selectors)
             f = selectors.map do |key, val|
               if val.is_a?(Array) && key == :class
-                "(" + val.map { |v| build_class_match(v) }.join(" and ") + ")"
+                '(' + val.map { |v| build_class_match(v) }.join(' and ') + ')'
               elsif val.is_a?(Array)
-                "(" + val.map { |v| equal_pair(building, key, v) }.join(" or ") + ")"
-              elsif val == true
+                '(' + val.map { |v| equal_pair(building, key, v) }.join(' or ') + ')'
+              elsif val.eql? true
                 attribute_presence(key)
-              elsif val == false
+              elsif val.eql? false
                 attribute_absence(key)
               else
                 equal_pair(building, key, val)
               end
             end
-            f.join(" and ")
+            f.join(' and ')
           end
 
           # @todo Get rid of building
           def equal_pair(building, key, value)
             if key == :class
               if value.strip.include?(' ')
-                Watir.logger.deprecate "Using the :class locator to locate multiple classes with a String value (i.e. \"#{value}\")",
+                dep = "Using the :class locator to locate multiple classes with a String value (i.e. \"#{value}\")"
+                Watir.logger.deprecate dep,
                                        "Array (e.g. #{value.split})",
-                                        ids: [:class_array]
+                                       ids: [:class_array]
               end
               build_class_match(value)
             elsif key == :label && @should_use_label_element
@@ -77,8 +77,10 @@ module Watir
               # type attributes can be upper case - downcase them
               # https://github.com/watir/watir/issues/72
               XpathSupport.downcase('@type')
+            when ::Symbol
+              "@#{key.to_s.tr('_', '-')}"
             else
-              "@#{key.to_s.tr("_", "-")}"
+              raise Error::Exception, "Unable to build XPath using #{key}"
             end
           end
 
@@ -88,19 +90,19 @@ module Watir
             xpath = './'
             xpath << case adjacent
                      when :ancestor
-                       "ancestor::"
+                       'ancestor::*'
                      when :preceding
-                       "preceding-sibling::"
+                       'preceding-sibling::*'
                      when :following
-                       "following-sibling::"
+                       'following-sibling::*'
                      when :child
-                       "child::"
+                       'child::*'
                      end
             xpath
           end
 
           def build_class_match(value)
-            if value.match(/^!/)
+            if value =~ /^!/
               klass = XpathSupport.escape " #{value[1..-1]} "
               "not(contains(concat(' ', @class, ' '), #{klass}))"
             else

data/lib/watir/locators/element/validator.rb

@@ -7,7 +7,7 @@ module Watir
           element_tag_name = element.tag_name.downcase
 
           if selector_tag_name
-            return unless selector_tag_name === element_tag_name
+            return unless element_tag_name =~ /#{selector_tag_name}/
           end
 
           element

data/lib/watir/locators/row/locator.rb

@@ -2,13 +2,11 @@ module Watir
   module Locators
     class Row
       class Locator < Element::Locator
-
         private
 
         def using_selenium(*)
           # force Watir usage
         end
-
       end
     end
   end

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

@@ -3,18 +3,17 @@ module Watir
     class Row
       class SelectorBuilder < Element::SelectorBuilder
         def build_wd_selector(selectors)
-          return if selectors.values.any? { |e| e.kind_of? Regexp }
-          selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
+          return if selectors.values.any? { |e| e.is_a? Regexp }
+
+          selectors.delete(:tag_name) || raise('internal error: no tag_name?!')
 
           expressions = generate_expressions(@query_scope.tag_name.downcase)
 
           attr_expr = xpath_builder.attribute_expression(nil, selectors)
 
-          unless attr_expr.empty?
-            expressions.map! { |e| "#{e}[#{attr_expr}]" }
-          end
+          expressions.map! { |e| "#{e}[#{attr_expr}]" } unless attr_expr.empty?
 
-          xpath = expressions.join(" | ")
+          xpath = expressions.join(' | ')
 
           p build_wd_selector: xpath if $DEBUG
 
@@ -25,9 +24,7 @@ module Watir
 
         def generate_expressions(tag_name)
           expressions = %w[./tr]
-          unless %w[tbody tfoot thead].include?(tag_name)
-            expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
-          end
+          expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr] unless %w[tbody tfoot thead].include?(tag_name)
           expressions
         end
       end

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

@@ -10,7 +10,7 @@ module Watir
           # difference between IDL vs content attribute.
           # Current Element design doesn't allow to do that in any
           # obvious way except to use regular expression.
-          if how == :value && what.kind_of?(String)
+          if how == :value && what.is_a?(String)
             [how, Regexp.new('^' + Regexp.escape(what) + '$')]
           else
             super

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

@@ -2,7 +2,6 @@ module Watir
   module Locators
     class TextField
       class Locator < Element::Locator
-
         private
 
         def using_selenium(*)
@@ -14,7 +13,7 @@ module Watir
 
           tag_name = element.tag_name.downcase
 
-          [:text, :value, :label].each do |key|
+          %i[text value label].each do |key|
             if rx_selector.key?(key)
               correct_key = tag_name == 'input' ? :value : :text
               rx_selector[correct_key] = rx_selector.delete(key)
@@ -23,7 +22,6 @@ module Watir
 
           super
         end
-
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Watir
     class TextField
       class SelectorBuilder < Element::SelectorBuilder
         def build_wd_selector(selectors)
-          return if selectors.values.any? { |e| e.kind_of? Regexp }
+          return if selectors.values.any? { |e| e.is_a? Regexp }
 
           selectors.delete(:tag_name)
 
@@ -11,7 +11,7 @@ module Watir
 
           xpath = ".//input[(not(@type) or (#{negative_type_expr}))"
           xpath << " and #{input_attr_exp}" unless input_attr_exp.empty?
-          xpath << "]"
+          xpath << ']'
 
           p build_wd_selector: xpath if $DEBUG
 
@@ -21,9 +21,9 @@ module Watir
         private
 
         def negative_type_expr
-          Watir::TextField::NON_TEXT_TYPES.map do |type|
-            "%s!=%s" % [XpathSupport.downcase('@type'), type.inspect]
-          end.join(' and ')
+          Watir::TextField::NON_TEXT_TYPES.map { |type|
+            format('%s!=%s', XpathSupport.downcase('@type'), type.inspect)
+          }.join(' and ')
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Watir
         class XPath < Element::SelectorBuilder::XPath
           def lhs_for(building, key)
             if building == :input && key == :text
-              "@value"
+              '@value'
             else
               super
             end

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

@@ -2,8 +2,9 @@ module Watir
   module Locators
     class TextField
       class Validator < Element::Validator
-        def validate(element, selector)
-          return unless element.tag_name.downcase == 'input'
+        def validate(element, _selector)
+          return unless element.tag_name.casecmp('input').zero?
+
           element
         end
       end

data/lib/watir/logger.rb

@@ -27,7 +27,7 @@ module Watir
                    :fatal, :fatal?,
                    :level
 
-    def initialize(progname="Watir")
+    def initialize(progname = 'Watir')
       @logger = create_logger($stdout)
       @logger.progname = progname
       @ignored = []
@@ -46,7 +46,7 @@ module Watir
     # 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 = ids.empty? ? '' : "[#{ids.map!(&:to_s).map(&:inspect).join(', ')}] "
       msg += message
       @logger.warn(msg, &block) unless (@ignored & ids).any?
     end
@@ -60,22 +60,10 @@ module Watir
       if severity.is_a?(Integer)
         @logger.level = severity
       else
-        case severity.to_s.downcase
-        when 'debug'.freeze
-          @logger.level = DEBUG
-        when 'info'.freeze
-          @logger.level = INFO
-        when 'warn'.freeze
-          @logger.level = WARN
-        when 'error'.freeze
-          @logger.level = ERROR
-        when 'fatal'.freeze
-          @logger.level = FATAL
-        when 'unknown'.freeze
-          @logger.level = UNKNOWN
-        else
-          raise ArgumentError, "invalid log level: #{severity}"
-        end
+        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
 
@@ -100,10 +88,12 @@ module Watir
     # @param [String] old
     # @param [String] new
     #
-    def deprecate(old, new, ids: [])
+    def deprecate(old, new, reference: '', ids: [])
       return if @ignored.include?('deprecations') || (@ignored & ids.map!(&:to_s)).any?
-      msg = ids.empty? ? "" : "[#{ids.map(&:inspect).join(", ")}] "
-      warn "[DEPRECATION] #{msg}#{old} is deprecated. Use #{new} instead."
+
+      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}"
     end
 
     private

data/lib/watir/navigation.rb

@@ -0,0 +1,49 @@
+module Watir
+  module Navigation
+    #
+    # Goes to the given URL.
+    #
+    # @example
+    #   browser.goto "watir.github.io"
+    #
+    # @param [String] uri The url.
+    # @return [String] The url you end up at.
+    #
+
+    def goto(uri)
+      uri = "http://#{uri}" unless uri =~ URI::DEFAULT_PARSER.make_regexp
+
+      @driver.navigate.to uri
+      @after_hooks.run
+
+      uri
+    end
+
+    #
+    # Navigates back in history.
+    #
+
+    def back
+      @driver.navigate.back
+      @after_hooks.run
+    end
+
+    #
+    # Navigates forward in history.
+    #
+
+    def forward
+      @driver.navigate.forward
+      @after_hooks.run
+    end
+
+    #
+    # Refreshes current page.
+    #
+
+    def refresh
+      @driver.navigate.refresh
+      @after_hooks.run
+    end
+  end # Navigation
+end # Watir

data/lib/watir/radio_set.rb

@@ -4,14 +4,12 @@ module Watir
     include Watir::Exception
     include Enumerable
 
-    delegate [:exists?, :present?, :visible?, :browser] => :source
+    delegate %i[exists? present? visible? browser] => :source
 
     attr_reader :source, :frame
 
     def initialize(query_scope, selector)
-      unless selector.kind_of? Hash
-        raise ArgumentError, "invalid argument: #{selector.inspect}"
-      end
+      raise ArgumentError, "invalid argument: #{selector.inspect}" unless selector.is_a? Hash
 
       @source = Radio.new(query_scope, selector)
       @frame = @source.parent(tag_name: :form)
@@ -50,13 +48,12 @@ module Watir
     def radio(opt = {})
       n = name
       if !n.empty? && (!opt[:name] || opt[:name] == n)
-        frame.radio(opt.merge name: n)
+        frame.radio(opt.merge(name: n))
       elsif n.empty?
         return source
       else
         raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
       end
-
     end
 
     #
@@ -66,7 +63,7 @@ module Watir
     def radios(opt = {})
       n = name
       if !n.empty? && (!opt[:name] || opt[:name] == n)
-        element_call(:wait_for_present) { frame.radios(opt.merge name: n) }
+        element_call(:wait_for_present) { frame.radios(opt.merge(name: n)) }
       elsif n.empty?
         Watir::RadioCollection.new(frame, element: source.wd)
       else
@@ -111,7 +108,7 @@ module Watir
     #
 
     def type
-      source.send :assert_exists
+      assert_exists
       'radio'
     end
 
@@ -161,6 +158,7 @@ module Watir
       found = frame.radio(label: str_or_rx)
 
       return found.selected? if found.exist?
+
       raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
     end
 
@@ -173,7 +171,7 @@ module Watir
 
     def value
       sel = selected
-      sel && sel.value
+      sel&.value
     end
 
     #
@@ -185,7 +183,7 @@ module Watir
 
     def text
       sel = selected
-      sel && sel.text
+      sel&.text
     end
 
     #
@@ -208,24 +206,25 @@ module Watir
     #
 
     def ==(other)
-      return false unless other.kind_of?(self.class)
+      return false unless other.is_a?(self.class)
+
       radios == other.radios
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
-    private
-
-    def element_call(*args, &blk)
-      source.send :element_call, *args, &blk
+    # Ruby 2.4+ complains about using #delegate to do this
+    %i[assert_exists element_call].each do |method|
+      define_method(method) do |*args, &blk|
+        source.send(method, *args, &blk)
+      end
     end
   end # RadioSet
 
   module Container
     def radio_set(*args)
-      RadioSet.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
+      RadioSet.new(self, extract_selector(args).merge(tag_name: 'input', type: 'radio'))
     end
 
     Watir.tag_to_class[:radio_set] = RadioSet
   end # Container
-
 end # Watir