capybara 2.15.1 → 3.35.3

data/lib/capybara/selector/filters/base.rb

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
+
 module Capybara
   class Selector
     module Filters
       class Base
-        def initialize(name, block, options={})
+        def initialize(name, matcher, block, **options)
           @name = name
+          @matcher = matcher
           @block = block
           @options = options
-          @options[:valid_values] = [true,false] if options[:boolean]
+          @options[:valid_values] = [true, false] if options[:boolean]
         end
 
         def default?
-          @options.has_key?(:default)
+          @options.key?(:default)
         end
 
         def default
@@ -19,13 +21,55 @@ module Capybara
         end
 
         def skip?(value)
-          @options.has_key?(:skip_if) && value == @options[:skip_if]
+          @options.key?(:skip_if) && value == @options[:skip_if]
+        end
+
+        def format
+          @options[:format]
+        end
+
+        def matcher?
+          !@matcher.nil?
+        end
+
+        def boolean?
+          !!@options[:boolean]
+        end
+
+        def handles_option?(option_name)
+          if matcher?
+            @matcher.match? option_name
+          else
+            @name == option_name
+          end
+        end
+
+      private
+
+        def apply(subject, name, value, skip_value, ctx)
+          return skip_value if skip?(value)
+
+          unless valid_value?(value)
+            raise ArgumentError,
+                  "Invalid value #{value.inspect} passed to #{self.class.name.split('::').last} #{name}" \
+                  "#{" : #{name}" if @name.is_a?(Regexp)}"
+          end
+
+          if @block.arity == 2
+            filter_context(ctx).instance_exec(subject, value, &@block)
+          else
+            filter_context(ctx).instance_exec(subject, name, value, &@block)
+          end
         end
 
-        private
+        def filter_context(context)
+          context || @block.binding.receiver
+        end
 
         def valid_value?(value)
-          !@options.has_key?(:valid_values) || Array(@options[:valid_values]).include?(value)
+          return true unless @options.key?(:valid_values)
+
+          Array(@options[:valid_values]).any? { |valid| valid === value } # rubocop:disable Style/CaseEquality
         end
       end
     end

data/lib/capybara/selector/filters/expression_filter.rb

@@ -1,40 +1,22 @@
 # frozen_string_literal: true
+
 require 'capybara/selector/filters/base'
 
 module Capybara
   class Selector
     module Filters
       class ExpressionFilter < Base
-        def apply_filter(expr, value)
-          return expr if skip?(value)
-
-          if !valid_value?(value)
-            msg = "Invalid value #{value.inspect} passed to expression filter #{@name} - "
-            if default?
-              warn msg + "defaulting to #{default}"
-              value = default
-            else
-              warn msg + "skipping"
-              return expr
-            end
-          end
-
-          @block.call(expr, value)
+        def apply_filter(expr, name, value, selector)
+          apply(expr, name, value, expr, selector)
         end
       end
 
       class IdentityExpressionFilter < ExpressionFilter
-        def initialize
-        end
-
-        def default?
-          false
-        end
-
-        def apply_filter(expr, _value)
-          return expr
-        end
+        def initialize(name); super(name, nil, nil); end
+        def default?; false; end
+        def matcher?; false; end
+        def apply_filter(expr, _name, _value, _ctx); expr; end
       end
     end
   end
-end
+end

data/lib/capybara/selector/filters/locator_filter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'capybara/selector/filters/base'
+
+module Capybara
+  class Selector
+    module Filters
+      class LocatorFilter < NodeFilter
+        def initialize(block, **options)
+          super(nil, nil, block, **options)
+        end
+
+        def matches?(node, value, context = nil, exact:)
+          apply(node, value, true, context, exact: exact, format: context&.default_format)
+        rescue Capybara::ElementNotFound
+          false
+        end
+
+      private
+
+        def apply(subject, value, skip_value, ctx, **options)
+          return skip_value if skip?(value)
+
+          filter_context(ctx).instance_exec(subject, value, **options, &@block)
+        end
+      end
+    end
+  end
+end

data/lib/capybara/selector/filters/node_filter.rb

@@ -1,25 +1,29 @@
 # frozen_string_literal: true
+
 require 'capybara/selector/filters/base'
 
 module Capybara
   class Selector
     module Filters
       class NodeFilter < Base
-        def matches?(node, value)
-          return true if skip?(value)
-
-          if !valid_value?(value)
-            msg = "Invalid value #{value.inspect} passed to filter #{@name} - "
-            if default?
-              warn msg + "defaulting to #{default}"
-              value = default
-            else
-              warn msg + "skipping"
-              return true
+        def initialize(name, matcher, block, **options)
+          super
+          @block = if boolean?
+            proc do |node, value|
+              error_cnt = errors.size
+              block.call(node, value).tap do |res|
+                add_error("Expected #{name} #{value} but it wasn't") if !res && error_cnt == errors.size
+              end
             end
+          else
+            block
           end
+        end
 
-          @block.call(node, value)
+        def matches?(node, name, value, context = nil)
+          apply(node, name, value, true, context)
+        rescue Capybara::ElementNotFound
+          false
         end
       end
     end

data/lib/capybara/selector/regexp_disassembler.rb

@@ -0,0 +1,214 @@
+# frozen_string_literal: true
+
+require 'regexp_parser'
+
+module Capybara
+  class Selector
+    # @api private
+    class RegexpDisassembler
+      def initialize(regexp)
+        @regexp = regexp
+      end
+
+      def alternated_substrings
+        @alternated_substrings ||= begin
+          or_strings = process(alternation: true)
+          remove_or_covered(or_strings)
+          or_strings.any?(&:empty?) ? [] : or_strings
+        end
+      end
+
+      def substrings
+        @substrings ||= begin
+          strs = process(alternation: false).first
+          remove_and_covered(strs)
+        end
+      end
+
+    private
+
+      def remove_and_covered(strings)
+        # delete_if is documented to modify the array after every block iteration - this doesn't appear to be true
+        # uniq the strings to prevent identical strings from removing each other
+        strings.uniq!
+
+        # If we have "ab" and "abcd" required - only need to check for "abcd"
+        strings.delete_if do |sub_string|
+          strings.any? do |cover_string|
+            next if sub_string.equal? cover_string
+
+            cover_string.include?(sub_string)
+          end
+        end
+      end
+
+      def remove_or_covered(or_series)
+        # If we are going to match `("a" and "b") or ("ade" and "bce")` it only makes sense to match ("a" and "b")
+
+        # Ensure minimum sets of strings are being or'd
+        or_series.each { |strs| remove_and_covered(strs) }
+
+        # Remove any of the alternated string series that fully contain any other string series
+        or_series.delete_if do |and_strs|
+          or_series.any? do |and_strs2|
+            next if and_strs.equal? and_strs2
+
+            remove_and_covered(and_strs + and_strs2) == and_strs
+          end
+        end
+      end
+
+      def process(alternation:)
+        strs = extract_strings(Regexp::Parser.parse(@regexp), alternation: alternation)
+        strs = collapse(combine(strs).map(&:flatten))
+        strs.each { |str| str.map!(&:upcase) } if @regexp.casefold?
+        strs
+      end
+
+      def combine(strs)
+        suffixes = [[]]
+        strs.reverse_each do |str|
+          if str.is_a? Set
+            prefixes = str.each_with_object([]) { |s, memo| memo.concat combine(s) }
+
+            result = []
+            prefixes.product(suffixes) { |pair| result << pair.flatten(1) }
+            suffixes = result
+          else
+            suffixes.each { |arr| arr.unshift str }
+          end
+        end
+        suffixes
+      end
+
+      def collapse(strs)
+        strs.map do |substrings|
+          substrings.slice_before(&:nil?).map(&:join).reject(&:empty?).uniq
+        end
+      end
+
+      def extract_strings(expression, alternation: false)
+        Expression.new(expression).extract_strings(alternation)
+      end
+
+      # @api private
+      class Expression
+        def initialize(exp)
+          @exp = exp
+        end
+
+        def extract_strings(process_alternatives)
+          strings = []
+          each do |exp|
+            next if exp.ignore?
+
+            next strings.push(nil) if exp.optional? && !process_alternatives
+
+            next strings.push(exp.alternative_strings) if exp.alternation? && process_alternatives
+
+            strings.concat(exp.strings(process_alternatives))
+          end
+          strings
+        end
+
+      protected
+
+        def alternation?
+          (type == :meta) && !terminal?
+        end
+
+        def optional?
+          min_repeat.zero?
+        end
+
+        def terminal?
+          @exp.terminal?
+        end
+
+        def strings(process_alternatives)
+          if indeterminate?
+            [nil]
+          elsif terminal?
+            terminal_strings
+          elsif optional?
+            optional_strings
+          else
+            repeated_strings(process_alternatives)
+          end
+        end
+
+        def terminal_strings
+          text = case @exp.type
+          when :literal then @exp.text
+          when :escape then @exp.char
+          else
+            return [nil]
+          end
+
+          optional? ? options_set(text) : repeat_set(text)
+        end
+
+        def optional_strings
+          options_set(extract_strings(true))
+        end
+
+        def repeated_strings(process_alternatives)
+          repeat_set extract_strings(process_alternatives)
+        end
+
+        def alternative_strings
+          alts = alternatives.map { |sub_exp| sub_exp.extract_strings(alternation: true) }
+          alts.all?(&:any?) ? Set.new(alts) : nil
+        end
+
+        def ignore?
+          [Regexp::Expression::Assertion::NegativeLookahead,
+           Regexp::Expression::Assertion::NegativeLookbehind].any? { |klass| @exp.is_a? klass }
+        end
+
+      private
+
+        def indeterminate?
+          %i[meta set].include?(type)
+        end
+
+        def min_repeat
+          @exp.repetitions.begin
+        end
+
+        def max_repeat
+          @exp.repetitions.end
+        end
+
+        def fixed_repeat?
+          min_repeat == max_repeat
+        end
+
+        def type
+          @exp.type
+        end
+
+        def repeat_set(str)
+          strs = Array(str * min_repeat)
+          strs.push(nil) unless fixed_repeat?
+          strs
+        end
+
+        def options_set(strs)
+          strs = [Set.new([[''], Array(strs)])]
+          strs.push(nil) unless max_repeat == 1
+          strs
+        end
+
+        def alternatives
+          @exp.alternatives.map { |exp| Expression.new(exp) }
+        end
+
+        def each
+          @exp.each { |exp| yield Expression.new(exp) }
+        end
+      end
+      private_constant :Expression
+    end
+  end
+end

data/lib/capybara/selector/selector.rb

@@ -1,257 +1,142 @@
 # frozen_string_literal: true
-require 'capybara/selector/filter_set'
-require 'capybara/selector/css'
-require 'xpath'
-
-#Patch XPath to allow a nil condition in where
-module XPath
-  class Renderer
-    undef :where if method_defined?(:where)
-    def where(on, condition)
-      condition = condition.to_s
-      if !condition.empty?
-        "#{on}[#{condition}]"
-      else
-        "#{on}"
-      end
-    end
-  end
-end
 
 module Capybara
-  class Selector
-
-    attr_reader :name, :format
-
+  class Selector < SimpleDelegator
     class << self
       def all
-        @selectors ||= {}
+        @definitions ||= {} # rubocop:disable Naming/MemoizedInstanceVariableName
       end
 
-      def add(name, &block)
-        all[name.to_sym] = Capybara::Selector.new(name.to_sym, &block)
+      def [](name)
+        all.fetch(name.to_sym) { |sel_type| raise ArgumentError, "Unknown selector type (:#{sel_type})" }
+      end
+
+      def add(name, **options, &block)
+        all[name.to_sym] = Definition.new(name.to_sym, **options, &block)
       end
 
       def update(name, &block)
-        all[name.to_sym].instance_eval(&block)
+        self[name].instance_eval(&block)
       end
 
       def remove(name)
         all.delete(name.to_sym)
       end
-    end
 
-    def initialize(name, &block)
-      @name = name
-      @filter_set = FilterSet.add(name){}
-      @match = nil
-      @label = nil
-      @failure_message = nil
-      @description = nil
-      @format = nil
-      @expression = nil
-      @expression_filters = {}
-      @default_visibility = nil
-      instance_eval(&block)
+      def for(locator)
+        all.values.find { |sel| sel.match?(locator) }
+      end
     end
 
-    def custom_filters
-      @filter_set.filters
-    end
+    attr_reader :errors
 
-    def node_filters
-      @filter_set.node_filters
+    def initialize(definition, config:, format:)
+      definition = self.class[definition] unless definition.is_a? Definition
+      super(definition)
+      @definition = definition
+      @config = config
+      @format = format
+      @errors = []
     end
 
-    def expression_filters
-      @filter_set.expression_filters
+    def format
+      @format || @definition.default_format
     end
+    alias_method :current_format, :format
 
-    ##
-    #
-    # Define a selector by an xpath expression
-    #
-    # @overload xpath(*expression_filters, &block)
-    #   @param [Array<Symbol>] expression_filters ([])  Names of filters that can be implemented via this expression
-    #   @yield [locator, options]                       The block to use to generate the XPath expression
-    #   @yieldparam [String] locator                    The locator string passed to the query
-    #   @yieldparam [Hash] options                      The options hash passed to the query
-    #   @yieldreturn [#to_xpath, #to_s]                 An object that can produce an xpath expression
-    #
-    # @overload xpath()
-    # @return [#call]                             The block that will be called to generate the XPath expression
-    #
-    def xpath(*expression_filters, &block)
-      if block
-        @format, @expression = :xpath, block
-        expression_filters.flatten.each { |ef| custom_filters[ef] = Filters::IdentityExpressionFilter.new }
-      end
-      format == :xpath ? @expression : nil
+    def enable_aria_label
+      @config[:enable_aria_label]
     end
 
-    ##
-    #
-    # Define a selector by a CSS selector
-    #
-    # @overload css(*expression_filters, &block)
-    #   @param [Array<Symbol>] expression_filters ([])  Names of filters that can be implemented via this CSS selector
-    #   @yield [locator, options]                   The block to use to generate the CSS selector
-    #   @yieldparam [String] locator               The locator string passed to the query
-    #   @yieldparam [Hash] options                 The options hash passed to the query
-    #   @yieldreturn [#to_s]                        An object that can produce a CSS selector
-    #
-    # @overload css()
-    # @return [#call]                             The block that will be called to generate the CSS selector
-    #
-    def css(*expression_filters, &block)
-      if block
-        @format, @expression = :css, block
-        expression_filters.flatten.each { |ef| custom_filters[ef] = nil }
-      end
-      format == :css ? @expression : nil
+    def enable_aria_role
+      @config[:enable_aria_role]
     end
 
-    ##
-    #
-    # Automatic selector detection
-    #
-    # @yield [locator]                   This block takes the passed in locator string and returns whether or not it matches the selector
-    # @yieldparam [String], locator      The locator string used to determin if it matches the selector
-    # @yieldreturn [Boolean]             Whether this selector matches the locator string
-    # @return [#call]                    The block that will be used to detect selector match
-    #
-    def match(&block)
-      @match = block if block
-      @match
+    def test_id
+      @config[:test_id]
     end
 
-    ##
-    #
-    # Set/get a descriptive label for the selector
-    #
-    # @overload label(label)
-    #   @param [String] label            A descriptive label for this selector - used in error messages
-    # @overload label()
-    # @return [String]                 The currently set label
-    #
-    def label(label=nil)
-      @label = label if label
-      @label
-    end
-
-    ##
-    #
-    # Description of the selector
-    #
-    # @param [Hash] options            The options of the query used to generate the description
-    # @return [String]                 Description of the selector when used with the options passed
-    #
-    def description(options={})
-      @filter_set.description(options)
-    end
-
-    def call(locator, options={})
+    def call(locator, **options)
       if format
-        # @expression.call(locator, options.select {|k,v| @expression_filters.include?(k)})
-        @expression.call(locator, options)
+        raise ArgumentError, "Selector #{@name} does not support #{format}" unless expressions.key?(format)
+
+        instance_exec(locator, **options, &expressions[format])
       else
-        warn "Selector has no format"
+        warn 'Selector has no format'
+      end
+    ensure
+      unless locator_valid?(locator)
+        warn "Locator #{locator.class}:#{locator.inspect} for selector #{name.inspect} must #{locator_description}. This will raise an error in a future version of Capybara."
       end
     end
 
-    ##
-    #
-    #  Should this selector be used for the passed in locator
-    #
-    #  This is used by the automatic selector selection mechanism when no selector type is passed to a selector query
-    #
-    # @param [String] locator     The locator passed to the query
-    # @return [Boolean]           Whether or not to use this selector
-    #
-    def match?(locator)
-      @match and @match.call(locator)
+    def add_error(error_msg)
+      errors << error_msg
     end
 
-    ##
-    #
-    # Define a non-expression filter for use with this selector
-    #
-    # @overload filter(name, *types, options={}, &block)
-    #   @param [Symbol] name            The filter name
-    #   @param [Array<Symbol>] types    The types of the filter - currently valid types are [:boolean]
-    #   @param [Hash] options ({})      Options of the filter
-    #   @option options [Array<>] :valid_values Valid values for this filter
-    #   @option options :default        The default value of the filter (if any)
-    #   @option options :skip_if        Value of the filter that will cause it to be skipped
-    #
-    def filter(name, *types_and_options, &block)
-      options = types_and_options.last.is_a?(Hash) ? types_and_options.pop.dup : {}
-      types_and_options.each { |k| options[k] = true }
-      custom_filters[name] = Filters::NodeFilter.new(name, block, options)
+    def expression_for(name, locator, config: @config, format: current_format, **options)
+      Selector.new(name, config: config, format: format).call(locator, **options)
     end
 
-    def expression_filter(name, *types_and_options, &block)
-      options = types_and_options.last.is_a?(Hash) ? types_and_options.pop.dup : {}
-      types_and_options.each { |k| options[k] = true }
-      custom_filters[name] = Filters::ExpressionFilter.new(name, block, options)
+    # @api private
+    def with_filter_errors(errors)
+      old_errors = @errors
+      @errors = errors
+      yield
+    ensure
+      @errors = old_errors
     end
 
-    def filter_set(name, filters_to_use = nil)
-      f_set = FilterSet.all[name]
-      f_set.filters.each do |n, filter|
-        custom_filters[n] = filter if filters_to_use.nil? || filters_to_use.include?(n)
-      end
-
-      f_set.descriptions.each { |desc| @filter_set.describe(&desc) }
+    # @api private
+    def builder(expr = nil)
+      case format
+      when :css
+        Capybara::Selector::CSSBuilder
+      when :xpath
+        Capybara::Selector::XPathBuilder
+      else
+        raise NotImplementedError, "No builder exists for selector of type #{default_format}"
+      end.new(expr)
     end
 
-    def describe &block
-      @filter_set.describe(&block)
-    end
+  private
 
-    ##
-    #
-    # Set the default visibility mode that shouble be used if no visibile option is passed when using the selector.
-    # If not specified will default to the behavior indicated by Capybara.ignore_hidden_elements
-    #
-    # @param [Symbol] default_visibility  Only find elements with the specified visibility:
-    #                                              * :all - finds visible and invisible elements.
-    #                                              * :hidden - only finds invisible elements.
-    #                                              * :visible - only finds visible elements.
-    def visible(default_visibility)
-      @default_visibility = default_visibility
+    def locator_description
+      locator_types.group_by { |lt| lt.is_a? Symbol }.map do |symbol, types_or_methods|
+        if symbol
+          "respond to #{types_or_methods.join(' or ')}"
+        else
+          "be an instance of #{types_or_methods.join(' or ')}"
+        end
+      end.join(' or ')
     end
 
-    def default_visibility(fallback = Capybara.ignore_hidden_elements)
-      if @default_visibility.nil?
-        fallback
-      else
-        @default_visibility
+    def locator_valid?(locator)
+      return true unless locator && locator_types
+
+      locator_types&.any? do |type_or_method|
+        type_or_method.is_a?(Symbol) ? locator.respond_to?(type_or_method) : type_or_method === locator # rubocop:disable Style/CaseEquality
       end
     end
 
-    private
+    def locate_field(xpath, locator, **_options)
+      return xpath if locator.nil?
 
-    def locate_field(xpath, locator, options={})
-      locate_xpath = xpath #need to save original xpath for the label wrap
-      if locator
-        locator = locator.to_s
-        attr_matchers =  XPath.attr(:id).equals(locator).or(
-                         XPath.attr(:name).equals(locator)).or(
-                         XPath.attr(:placeholder).equals(locator)).or(
-                         XPath.attr(:id).equals(XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for)))
-        attr_matchers = attr_matchers.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
+      locate_xpath = xpath # Need to save original xpath for the label wrap
+      locator = locator.to_s
+      attr_matchers = [XPath.attr(:id) == locator,
+                       XPath.attr(:name) == locator,
+                       XPath.attr(:placeholder) == locator,
+                       XPath.attr(:id) == XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for)].reduce(:|)
+      attr_matchers |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
+      attr_matchers |= XPath.attr(test_id) == locator if test_id
 
-        locate_xpath = locate_xpath[attr_matchers]
-        locate_xpath = locate_xpath.union(XPath.descendant(:label)[XPath.string.n.is(locator)].descendant(xpath))
-      end
-
-      # locate_xpath = [:name, :placeholder].inject(locate_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-      locate_xpath
+      locate_xpath = locate_xpath[attr_matchers]
+      locate_xpath + locate_label(locator).descendant(xpath)
     end
 
-    def describe_all_expression_filters(opts={})
-      expression_filters.map { |ef| " with #{ef} #{opts[ef]}" if opts.has_key?(ef) }.join
+    def locate_label(locator)
+      XPath.descendant(:label)[XPath.string.n.is(locator)]
     end
 
     def find_by_attr(attribute, value)
@@ -259,18 +144,12 @@ module Capybara
       if respond_to?(finder_name, true)
         send(finder_name, value)
       else
-        value ? XPath.attr(attribute).equals(value) : nil
+        value ? XPath.attr(attribute) == value : nil
       end
     end
 
     def find_by_class_attr(classes)
-      if classes
-        Array(classes).map do |klass|
-          "contains(concat(' ',normalize-space(@class),' '),' #{klass} ')"
-        end.join(" and ").to_sym
-      else
-        nil
-      end
+      Array(classes).map { |klass| XPath.attr(:class).contains_word(klass) }.reduce(:&)
     end
   end
 end