watir 6.16.2 → 6.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b4ce5fc3a28e83b85751052967ecdaa6d87b4d
-  data.tar.gz: 82dc5e6c96e4f259c12865a198503b39674094b7
+  metadata.gz: b416cb3a4dcc8350fc8f8b5994f9b58e8b3fb1c0
+  data.tar.gz: 6fd65f2eda2bafd7993789c311852258481f7199
 SHA512:
-  metadata.gz: f57ef0d029dd2c0bd703d416288a1f65cfd0a1aaab36e33bd79924b54ae5cb796774fa44e2a728e508d1af0cf8e11bb7b595851d0d59b3ee587c5feed42f808e
-  data.tar.gz: 18f052aaca388fef0191bf23c115cac21bff5aed3f692d6e5c1794ef13cf555f6745f2b8b569f7f3a760a843226844f6ef53dc43ef9c95efb532bf0e6a7e9d67
+  metadata.gz: 767c776aa67bb214410cf07040fcc5531ee0f8bdee073f8535fe18b6eaeba2fe723eb8f48cdfb5394ff9258b0a898130a9881e140cdc22ebd550e34f15428e01
+  data.tar.gz: 0da908dc00c76f593dce7e7547505541b805cd031d1c17158ef268b03498d2d1133ae1115ea2e65ca30e0939f7c455d21791f89bad5bb014888b2daab033c03b

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.16.3 (2018-12-24)
+
+* Minor adjustments to support locator extensions
+
 ### 6.16.2 (2018-12-24)
 
 * Fix bug merging scope when locating nested elements with css locator (#841)

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

@@ -15,7 +15,8 @@ module Watir
         def locate(built)
           @built = built.dup
           @driver_scope = locator_scope.wd
-          matching_elements(@built, :first)
+          @filter = :first
+          matching_elements
         rescue Selenium::WebDriver::Error::NoSuchElementError
           nil
         end
@@ -23,37 +24,40 @@ module Watir
         def locate_all(built)
           @built = built.dup
           @driver_scope = locator_scope.wd
-          raise ArgumentError, "can't locate all elements by :index" if built.key?(:index)
+          @filter = :all
 
-          [matching_elements(@built, :all)].flatten
+          return [matching_elements].flatten unless @built.key?(:index)
+
+          raise ArgumentError, "can't locate all elements by :index"
         end
 
         private
 
-        def matching_elements(built, filter)
-          return locate_element(*built.to_a.flatten) if built.size == 1 && filter == :first
+        def matching_elements
+          return locate_element(*@built.to_a.flatten) if @built.size == 1 && @filter == :first
 
-          wd_locator_key = (Watir::Locators::W3C_FINDERS & built.keys).first
-          wd_locator = built.select { |k, _v| wd_locator_key == k }
-          match_values = built.reject { |k, _v| wd_locator_key == k }
+          # SelectorBuilder only allows one of these
+          wd_locator_key = (Watir::Locators::W3C_FINDERS & @built.keys).first
+          wd_locator = @built.select { |k, _v| wd_locator_key == k }
+          match_values = @built.reject { |k, _v| wd_locator_key == k }
 
           # TODO: Wrap this to continue trying until default timeout
           retries = 0
           begin
             elements = locate_elements(*wd_locator.to_a.flatten)
 
-            element_matcher.match(elements, match_values, filter)
+            element_matcher.match(elements, match_values, @filter)
           rescue Selenium::WebDriver::Error::StaleElementReferenceError
             retries += 1
             sleep 0.5
             retry unless retries > 2
-            target = filter == :all ? 'element collection' : 'element'
+            target = @filter == :all ? 'element collection' : 'element'
             raise LocatorException, "Unable to locate #{target} from #{@selector} due to changing page"
           end
         end
 
         def locator_scope
-          @built.delete(:scope) || @query_scope.browser
+          @locator_scope ||= @built.delete(:scope) || @query_scope.browser
         end
 
         def locate_element(how, what, scope = driver_scope)

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.16.2
+  version: 6.16.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver