watir 6.19.1 → 7.0.0.beta1

data/lib/watir/elements/text_field.rb

@@ -18,12 +18,12 @@ module Watir
   end # TextField
 
   module Container
-    def text_field(*args)
-      TextField.new(self, extract_selector(args).merge(tag_name: 'input'))
+    def text_field(opts = {})
+      TextField.new(self, opts.merge(tag_name: 'input'))
     end
 
-    def text_fields(*args)
-      TextFieldCollection.new(self, extract_selector(args).merge(tag_name: 'input'))
+    def text_fields(opts = {})
+      TextFieldCollection.new(self, opts.merge(tag_name: 'input'))
     end
   end # Container
 

data/lib/watir/generator/base/generator.rb

@@ -84,12 +84,12 @@ module Watir
           @io.puts indent(<<~CODE, 2)
 
             # @return [#{element_class}]
-            def #{singular}(*args)
-              #{element_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            def #{singular}(opts = {})
+              #{element_class}.new(self, opts.merge(tag_name: #{tag_string}))
             end
             # @return [#{collection_class}]
-            def #{plural}(*args)
-              #{collection_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            def #{plural}(opts = {})
+              #{collection_class}.new(self, opts.merge(tag_name: #{tag_string}))
             end
             Watir.tag_to_class[#{tag.to_sym.inspect}] = #{element_class}
 

data/lib/watir/generator/base/visitor.rb

@@ -54,35 +54,6 @@ module Watir
           # ignored
         end
 
-        # TODO: do everything in the visitor somehow?
-        # problem is we lack the tag name info while walking the interface AST
-        # #
-        # # Watir generator visitor interface
-        # #
-        #
-        # def visit_tag(tag_name, interface_name)
-        #   tag_string       = tag.inspect
-        #   singular         = Util.paramify(classify_regexp, tag)
-        #   plural           = singular.pluralize
-        #   element_class    = Util.classify(classify_regexp, interfaces.first.name)
-        #   collection_class = "#{element_class}Collection"
-        #
-        #   [:defn,
-        #    :a,
-        #    [:args, :"*args"],
-        #    [:scope,
-        #     [:block,
-        #      [:call,
-        #       [:const, :Anchor],
-        #       :new,
-        #       [:arglist,
-        #        [:self],
-        #        [:call,
-        #         [:call, nil, :extract_selector, [:arglist, [:lvar, :args]]],
-        #         :merge,
-        #         [:arglist, [:hash, [:lit, :tag_name], [:str, "a"]]]]]]]]]
-        # end
-
         private
 
         def element_class(name, attributes, parent)

data/lib/watir/generator/html/generator.rb

@@ -14,7 +14,8 @@ module Watir
       end
 
       def ignored_attributes
-        %w[cells elements hash rows span text size selected? style width height tHead tFoot link options selected]
+        %w[cells elements hash rows span text size selected? style
+           width height tHead tFoot link options selected caption]
       end
 
       def generator_implementation

data/lib/watir/has_window.rb

@@ -9,8 +9,8 @@ module Watir
     # @return [Array<Window>]
     #
 
-    def windows(*args)
-      WindowCollection.new self, extract_selector(args)
+    def windows(opts = {})
+      WindowCollection.new self, opts
     end
 
     #
@@ -22,8 +22,8 @@ module Watir
     # @return [Window]
     #
 
-    def window(*args, &blk)
-      win = Window.new self, extract_selector(args)
+    def window(opts = {}, &blk)
+      win = Window.new self, opts
 
       win.use(&blk) if block_given?
 

data/lib/watir/http_client.rb

@@ -1,13 +1,5 @@
 module Watir
   class HttpClient < Selenium::WebDriver::Remote::Http::Default
-    # TODO: Remove for Watir 7; :client_timeout will be marked deprecated in 6.19
-    # :open_timeout should have been changed in Selenium a while back, is in 4.beta2
-    def initialize(open_timeout: nil, read_timeout: nil, client_timeout: nil)
-      read_timeout ||= client_timeout
-      open_timeout ||= client_timeout || 60
-      super(open_timeout: open_timeout, read_timeout: read_timeout)
-    end
-
     def request(verb, url, headers, payload, redirects = 0)
       headers['User-Agent'] = "#{headers['User-Agent']} watir/#{Watir::VERSION}"
 

data/lib/watir/locators.rb

@@ -26,11 +26,7 @@ require 'watir/locators/text_field/matcher'
 
 module Watir
   module Locators
-    W3C_FINDERS = %i[css
-                     link
-                     link_text
-                     partial_link_text
-                     xpath].freeze
+    W3C_FINDERS = %i[css xpath].freeze
 
     module ClassHelpers
       def locator_class

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

@@ -2,29 +2,6 @@ module Watir
   module Locators
     class Button
       class Matcher < Element::Matcher
-        def elements_match?(element, values_to_match)
-          copy_values_to_match = values_to_match.dup
-          value = copy_values_to_match.delete(:value)
-
-          if value
-            matching = matches_values?(fetch_value(element, :text), value)
-            deprecate_value_button if matching
-
-            matching ||= matches_values?(fetch_value(element, :value), value)
-
-            return false unless matching
-            return true if copy_values_to_match.empty?
-          end
-
-          super(element, copy_values_to_match)
-        end
-
-        def deprecate_value_button
-          Watir.logger.deprecate(':value locator key for finding button text',
-                                 'use :text locator',
-                                 ids: [:value_button])
-        end
-
         def validate_tag(element, _expected)
           tag_name = fetch_value(element, :tag_name)
           return unless %w[input button].include?(tag_name)

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

@@ -44,22 +44,11 @@ module Watir
             # :text locator is already dealt with in #tag_name_string
             value = @selector.delete(:value)
 
-            case value
-            when nil
-              ''
-            when Regexp
-              res = "[#{predicate_conversion(:text, value)} or #{predicate_conversion(:value, value)}]"
-              @built.delete(:text)
-              res
-            else
-              "[#{predicate_expression(:text, value)} or #{predicate_expression(:value, value)}]"
-            end
-          end
+            return '' if value.nil?
 
-          def predicate_conversion(key, regexp)
-            res = key == :text ? super(:contains_text, regexp) : super
-            @built[key] = @built.delete(:contains_text) if @built.key?(:contains_text)
-            res
+            result = value.nil? ? '' : "[#{process_attribute(:text, value)} or #{process_attribute(:value, value)}]"
+            @built.delete(:text)
+            result
           end
 
           def input_types(type = nil)

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

@@ -3,6 +3,7 @@ module Watir
     class Element
       class Matcher
         include Exception
+        include JSSnippets
 
         attr_reader :query_scope, :selector
 
@@ -55,10 +56,10 @@ module Watir
         end
 
         def elements_match?(element, values_to_match)
-          matches = values_to_match.all? do |how, expected|
+          values_to_match.all? do |how, expected|
             if how == :tag_name
               validate_tag(element, expected)
-            # TODO: Can this be class_name here or does that get converted?
+              # TODO: Can this be class_name here or does that get converted?
             elsif %i[class class_name].include?(how)
               value = fetch_value(element, how)
               [expected].flatten.all? do |match|
@@ -70,10 +71,6 @@ module Watir
               matches_values?(fetch_value(element, how), expected)
             end
           end
-
-          deprecate_text_regexp(element, values_to_match) if values_to_match[:text] && matches
-
-          matches
         end
 
         def matches_values?(found, expected)
@@ -85,7 +82,7 @@ module Watir
           when :tag_name
             element.tag_name.downcase
           when :text
-            element.text
+            execute_js(:getTextContent, element)
           when :visible
             element.displayed?
           when :visible_text
@@ -112,18 +109,6 @@ module Watir
           tag_name = fetch_value(element, :tag_name)
           matches_values?(tag_name, expected)
         end
-
-        def deprecate_text_regexp(element, selector)
-          new_element = Watir::Element.new(@query_scope, element: element)
-          text_content = new_element.text_content
-
-          return if text_content =~ /#{selector[:text]}/
-
-          key = @selector.key?(:text) ? 'text' : 'label'
-          selector_text = selector[:text].inspect
-          dep = "Using :#{key} locator with RegExp #{selector_text} to match an element that includes hidden text"
-          Watir.logger.deprecate(dep, ":visible_#{key}", ids: [:text_regexp])
-        end
       end
     end
   end

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

@@ -25,7 +25,6 @@ module Watir
         def build(selector)
           @selector = selector
 
-          deprecated_locators
           normalize_selector
           inspected = selector.inspect
           scope = @query_scope unless @selector.key?(:scope) || @query_scope.is_a?(Watir::Browser)
@@ -45,16 +44,13 @@ module Watir
         private
 
         def normalize_selector
+          # TODO: This can be more specific now that only 2
           raise LocatorException, "Can not locate element with #{wd_locators}" if wd_locators.size > 1
 
           @selector[:scope] = @query_scope.selector_builder.built if merge_scope?
 
           if @selector.key?(:class) || @selector.key?(:class_name)
-            classes = ([@selector[:class]].flatten + [@selector.delete(:class_name)].flatten).compact
-
-            deprecate_class_array(classes)
-
-            @selector[:class] = classes
+            @selector[:class] = ([@selector[:class]].flatten + [@selector.delete(:class_name)].flatten).compact
           end
 
           if @selector[:adjacent] == :ancestor && @selector.key?(:text)
@@ -78,17 +74,6 @@ module Watir
           scope_invalid_locators.empty?
         end
 
-        def deprecate_class_array(class_array)
-          class_array.each do |class_name|
-            next unless class_name.is_a?(String) && class_name.strip.include?(' ')
-
-            dep = "Using the :class locator to locate multiple classes with a String value (i.e. \"#{class_name}\")"
-            Watir.logger.deprecate dep,
-                                   "Array (e.g. #{class_name.split})",
-                                   ids: [:class_array]
-          end
-        end
-
         def check_type(how, what)
           if %i[class class_name].include? how
             [what].flatten.each { |value| raise_unless(value, VALID_WHATS[how]) }
@@ -114,20 +99,12 @@ module Watir
           when :class
             what = false if what.tap { |arr| arr.delete('') }.empty?
             [how, what]
-          when :link
-            [:link_text, what]
           when :label, :visible_label
             if should_use_label_element?
               ["#{how}_element".to_sym, what]
             else
               [how, what]
             end
-          when :caption
-            # This allows any element to be located with 'caption' instead of 'text'
-            # It is deprecated because caption is a valid attribute on a Table
-            # It is also a valid Element, so it also needs to be removed from the Table attributes list
-            Watir.logger.deprecate('Locating elements with :caption', ':text locator', ids: [:caption])
-            [:text, what]
           else
             check_custom_attribute how
             [how, what]
@@ -174,18 +151,6 @@ module Watir
 
           raise TypeError, "expected one of #{types}, got #{what.inspect}:#{what.class}"
         end
-
-        def deprecated_locators
-          %i[partial_link_text link_text link].each do |locator|
-            next unless @selector.key?(locator)
-
-            Watir.logger.deprecate(":#{locator} locator", ':visible_text', ids: [:link_text])
-            tag = @selector[:tag_name]
-            next if tag.nil? || tag == 'a'
-
-            raise LocatorException, "Can not use #{locator} locator to find a #{tag} element"
-          end
-        end
       end
     end
   end

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

@@ -120,37 +120,24 @@ module Watir
           end
 
           def text_string
-            text = @selector.delete :text
-
-            case text
-            when nil
-              ''
-            when Regexp
-              @built[:text] = text
-              ''
-            else
-              "[#{predicate_expression(:text, text)}]"
-            end
+            result = equal_or_contains(@selector.delete(:text))
+            result.nil? ? '' : "[#{result}]"
           end
 
           def label_element_string
-            label = @selector.delete :label_element
-
-            return '' if label.nil?
+            text = @selector.delete(:label_element)
+            return '' if text.nil?
 
-            key = label.is_a?(Regexp) ? :contains_text : :text
+            result = equal_or_contains(text)
+            @built[:label_element] = @built.delete(:text) if @built.key?(:text)
 
-            value = process_attribute(key, label)
+            result.nil? ? '' : "[@id=//label[#{result}]/@for or parent::label[#{result}]]"
+          end
 
-            @built[:label_element] = @built.delete :contains_text if @built.key?(:contains_text)
+          def equal_or_contains(value)
+            return nil if value.nil? || value.is_a?(String) && value.empty? || value.inspect == '//'
 
-            # TODO: This conditional can be removed when we remove this deprecation
-            if label.is_a?(Regexp)
-              @built[:label_element] = label
-              ''
-            else
-              "[@id=//label[#{value}]/@for or parent::label[#{value}]]"
-            end
+            process_attribute(:text, value)
           end
 
           def attribute_string
@@ -203,23 +190,21 @@ module Watir
           end
 
           def lhs_for(key, downcase: false)
-            case key
-            when String
-              process_string key
-            when :tag_name
-              'local-name()'
-            when :href
-              'normalize-space(@href)'
-            when :text
-              'normalize-space()'
-            when :contains_text
-              'normalize-space()'
-            when ::Symbol
-              lhs = process_string key.to_s.tr('_', '-')
-              downcase ? XpathSupport.downcase(lhs) : lhs
-            else
-              raise LocatorException, "Unable to build XPath using #{key}:#{key.class}"
-            end
+            lhs = case key
+                  when String
+                    process_string key
+                  when :tag_name
+                    'local-name()'
+                  when :href
+                    'normalize-space(@href)'
+                  when :text
+                    'normalize-space()'
+                  when ::Symbol
+                    process_string key.to_s.tr('_', '-')
+                  else
+                    raise LocatorException, "Unable to build XPath using #{key}:#{key.class}"
+                  end
+            downcase ? XpathSupport.downcase(lhs) : lhs
           end
 
           def attribute_presence(attribute)

data/lib/watir/radio_set.rb

@@ -218,8 +218,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
 
     #