lib/watir/locators/element/locator.rb in watir-6.16.2 vs lib/watir/locators/element/locator.rb in watir-6.16.3

@@ -13,48 +13,52 @@
         end
 
         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
 
         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)
           scope.find_element(how, what)
         end