capybara 2.13.0 → 2.18.0

data/lib/capybara/selector/selector.rb

@@ -21,7 +21,7 @@ end
 module Capybara
   class Selector
 
-    attr_reader :name, :format, :expression_filters
+    attr_reader :name, :format
 
     class << self
       def all
@@ -50,7 +50,7 @@ module Capybara
       @description = nil
       @format = nil
       @expression = nil
-      @expression_filters = []
+      @expression_filters = {}
       @default_visibility = nil
       instance_eval(&block)
     end
@@ -59,6 +59,14 @@ module Capybara
       @filter_set.filters
     end
 
+    def node_filters
+      @filter_set.node_filters
+    end
+
+    def expression_filters
+      @filter_set.expression_filters
+    end
+
     ##
     #
     # Define a selector by an xpath expression
@@ -74,7 +82,10 @@ module Capybara
     # @return [#call]                             The block that will be called to generate the XPath expression
     #
     def xpath(*expression_filters, &block)
-      @format, @expression_filters, @expression = :xpath, expression_filters.flatten, block if block
+      if block
+        @format, @expression = :xpath, block
+        expression_filters.flatten.each { |ef| custom_filters[ef] = Filters::IdentityExpressionFilter.new }
+      end
       format == :xpath ? @expression : nil
     end
 
@@ -93,7 +104,10 @@ module Capybara
     # @return [#call]                             The block that will be called to generate the CSS selector
     #
     def css(*expression_filters, &block)
-      @format, @expression_filters, @expression = :css, expression_filters.flatten, block if block
+      if block
+        @format, @expression = :css, block
+        expression_filters.flatten.each { |ef| custom_filters[ef] = nil }
+      end
       format == :css ? @expression : nil
     end
 
@@ -172,8 +186,14 @@ module Capybara
     #
     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] = Filter.new(name, block, options)
+      types_and_options.each { |k| options[k] = true }
+      custom_filters[name] = Filters::NodeFilter.new(name, block, 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)
     end
 
     def filter_set(name, filters_to_use = nil)
@@ -181,6 +201,7 @@ module Capybara
       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) }
     end
 
@@ -201,9 +222,9 @@ module Capybara
       @default_visibility = default_visibility
     end
 
-    def default_visibility
+    def default_visibility(fallback = Capybara.ignore_hidden_elements)
       if @default_visibility.nil?
-        Capybara.ignore_hidden_elements
+        fallback
       else
         @default_visibility
       end
@@ -215,17 +236,17 @@ module Capybara
       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) |
-                         XPath.attr(:name).equals(locator) |
-                         XPath.attr(:placeholder).equals(locator) |
-                         XPath.attr(:id).equals(XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for))
-        attr_matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+        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 = locate_xpath[attr_matchers]
-        locate_xpath += XPath.descendant(:label)[XPath.string.n.is(locator)].descendant(xpath)
+        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 = [:name, :placeholder].inject(locate_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
       locate_xpath
     end
 

data/lib/capybara/selector.rb

@@ -6,11 +6,15 @@ Capybara::Selector::FilterSet.add(:_field) do
   filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
   filter(:multiple, :boolean) { |node, value| !(value ^ node.multiple?) }
 
+  expression_filter(:name) { |xpath, val| xpath[XPath.attr(:name).equals(val)] }
+  expression_filter(:placeholder) { |xpath, val| xpath[XPath.attr(:placeholder).equals(val)] }
+
   describe do |options|
     desc, states = String.new, []
     states << 'checked' if options[:checked] || (options[:unchecked] == false)
     states << 'not checked' if options[:unchecked] || (options[:checked] == false)
     states << 'disabled' if options[:disabled] == true
+    states << 'not disabled' if options[:disabled] == false
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc << " with the multiple attribute" if options[:multiple] == true
     desc << " without the multiple attribute" if options[:multiple] == false
@@ -65,21 +69,21 @@ end
 # @filter [Boolean] :disabled Match disabled field?
 # @filter [Boolean] :multiple Match fields that accept multiple values
 Capybara.add_selector(:field) do
-  xpath(:name, :placeholder, :type) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:input, :textarea, :select)[~XPath.attr(:type).one_of('submit', 'image', 'hidden')]
-    if options[:type]
-      type=options[:type].to_s
-      if ['textarea', 'select'].include?(type)
-        xpath = XPath.descendant(type.to_sym)
-      else
-        xpath = xpath[XPath.attr(:type).equals(type)]
-      end
+    locate_field(xpath, locator, options)
+  end
+
+  expression_filter(:type) do |expr, type|
+    type = type.to_s
+    if ['textarea', 'select'].include?(type)
+      expr.axis(:self, type.to_sym)
+    else
+      expr[XPath.attr(:type).equals(type)]
     end
-    xpath=locate_field(xpath, locator, options)
-    xpath
   end
 
-  filter_set(:_field) # checked/unchecked/disabled/multiple
+  filter_set(:_field) # checked/unchecked/disabled/multiple/name/placeholder
 
   filter(:readonly, :boolean) { |node, value| not(value ^ node.readonly?) }
   filter(:with) do |node, with|
@@ -87,7 +91,7 @@ Capybara.add_selector(:field) do
   end
   describe do |options|
     desc = String.new
-    (expression_filters - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.has_key?(ef) }
+    (expression_filters.keys - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.has_key?(ef) }
     desc << " of type #{options[:type].inspect}" if options[:type]
     desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
     desc
@@ -107,7 +111,7 @@ end
 Capybara.add_selector(:fieldset) do
   xpath(:legend) do |locator, options|
     xpath = XPath.descendant(:fieldset)
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.child(:legend)[XPath.string.n.is(locator.to_s)]] unless locator.nil?
+    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.child(:legend)[XPath.string.n.is(locator.to_s)]] unless locator.nil?
     xpath = xpath[XPath.child(:legend)[XPath.string.n.is(options[:legend])]] if options[:legend]
     xpath
   end
@@ -135,11 +139,11 @@ Capybara.add_selector(:link) do
     end
     unless locator.nil?
       locator = locator.to_s
-      matchers = XPath.attr(:id).equals(locator) |
-                 XPath.string.n.is(locator) |
-                 XPath.attr(:title).is(locator) |
-                 XPath.descendant(:img)[XPath.attr(:alt).is(locator)]
-      matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      matchers = XPath.attr(:id).equals(locator).or(
+                 XPath.string.n.is(locator)).or(
+                 XPath.attr(:title).is(locator)).or(
+                 XPath.descendant(:img)[XPath.attr(:alt).is(locator)])
+      matchers = matchers.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
       xpath = xpath[matchers]
     end
     xpath = [:title].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
@@ -184,21 +188,21 @@ Capybara.add_selector(:button) do
 
     unless locator.nil?
       locator = locator.to_s
-      locator_matches = XPath.attr(:id).equals(locator) | XPath.attr(:value).is(locator) | XPath.attr(:title).is(locator)
-      locator_matches |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      locator_matches = XPath.attr(:id).equals(locator).or XPath.attr(:value).is(locator).or XPath.attr(:title).is(locator)
+      locator_matches = locator_matches.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
 
       input_btn_xpath = input_btn_xpath[locator_matches]
 
-      btn_xpath = btn_xpath[locator_matches | XPath.string.n.is(locator) | XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
+      btn_xpath = btn_xpath[locator_matches.or XPath.string.n.is(locator).or XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
 
       alt_matches = XPath.attr(:alt).is(locator)
-      alt_matches |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
+      alt_matches = alt_matches.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
       image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
-    res_xpath = input_btn_xpath + btn_xpath + image_btn_xpath
+    res_xpath = input_btn_xpath.union(btn_xpath).union(image_btn_xpath)
 
-    res_xpath = expression_filters.inject(res_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+    res_xpath = expression_filters.keys.inject(res_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
 
     res_xpath
   end
@@ -220,7 +224,7 @@ end
 Capybara.add_selector(:link_or_button) do
   label "link or button"
   xpath do |locator, options|
-    self.class.all.values_at(:link, :button).map {|selector| selector.xpath.call(locator, options)}.reduce(:+)
+    self.class.all.values_at(:link, :button).map {|selector| selector.xpath.call(locator, options)}.reduce(:union)
   end
 
   filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| node.tag_name == "a" or not(value ^ node.disabled?) }
@@ -237,18 +241,28 @@ end
 # @filter [String] :name  Matches the name attribute
 # @filter [String] :placeholder  Matches the placeholder attribute
 # @filter [String] :with  Matches the current value of the field
+# @filter [String] :type Matches the type attribute of the field or element type for 'textarea'
 # @filter [String, Array<String>] :class  Matches the class(es) provided
 # @filter [Boolean] :disabled Match disabled field?
 # @filter [Boolean] :multiple Match fields that accept multiple values
 #
 Capybara.add_selector(:fillable_field) do
   label "field"
-  xpath(:name, :placeholder) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:input, :textarea)[~XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
     locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:disabled, :multiple])
+  expression_filter(:type) do |expr, type|
+    type = type.to_s
+    if ['textarea'].include?(type)
+      expr.axis(:self, type.to_sym)
+    else
+      expr[XPath.attr(:type).equals(type)]
+    end
+  end
+
+  filter_set(:_field, [:disabled, :multiple, :name, :placeholder])
 
   filter(:with) do |node, with|
     with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
@@ -277,12 +291,12 @@ end
 #
 Capybara.add_selector(:radio_button) do
   label "radio button"
-  xpath(:name) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('radio')]
     locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:checked, :unchecked, :disabled])
+  filter_set(:_field, [:checked, :unchecked, :disabled, :name])
 
   filter(:option)  { |node, value|  node.value == value.to_s }
 
@@ -308,12 +322,12 @@ end
 # @filter [String] :option Match the value
 #
 Capybara.add_selector(:checkbox) do
-  xpath(:name) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('checkbox')]
     locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:checked, :unchecked, :disabled])
+  filter_set(:_field, [:checked, :unchecked, :disabled, :name])
 
   filter(:option)  { |node, value|  node.value == value.to_s }
 
@@ -339,15 +353,16 @@ end
 # @filter [Array<String>] :options Exact match options
 # @filter [Array<String>] :with_options Partial match options
 # @filter [String, Array<String>] :selected Match the selection(s)
+# @filter [String, Array<String>] :with_selected Partial match the selection(s)
 #
 Capybara.add_selector(:select) do
   label "select box"
-  xpath(:name, :placeholder) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:select)
     locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:disabled, :multiple])
+  filter_set(:_field, [:disabled, :multiple, :name, :placeholder])
 
   filter(:options) do |node, options|
     if node.visible?
@@ -367,8 +382,13 @@ Capybara.add_selector(:select) do
   end
 
   filter(:selected) do |node, selected|
-    actual = node.all(:xpath, './/option', visible: false).select { |option| option.selected? }.map { |option| option.text(:all) }
-    [selected].flatten.sort == actual.sort
+    actual = node.all(:xpath, './/option', visible: false).select(&:selected?).map { |option| option.text(:all) }
+    Array(selected).sort == actual.sort
+  end
+
+  filter(:with_selected) do |node, selected|
+    actual = node.all(:xpath, './/option', visible: false).select(&:selected?).map { |option| option.text(:all) }
+    (Array(selected) - actual).empty?
   end
 
   describe do |options|
@@ -376,6 +396,7 @@ Capybara.add_selector(:select) do
     desc << " with options #{options[:options].inspect}" if options[:options]
     desc << " with at least options #{options[:with_options].inspect}" if options[:with_options]
     desc << " with #{options[:selected].inspect} selected" if options[:selected]
+    desc << " with at least #{options[:with_selected].inspect} selected" if options[:with_selected]
     desc << describe_all_expression_filters(options)
     desc
   end
@@ -420,12 +441,12 @@ end
 #
 Capybara.add_selector(:file_field) do
   label "file field"
-  xpath(:name) do |locator, options|
+  xpath do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('file')]
     locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:disabled, :multiple])
+  filter_set(:_field, [:disabled, :multiple, :name])
 
   describe do |options|
     desc = String.new
@@ -445,7 +466,7 @@ Capybara.add_selector(:label) do
   label "label"
   xpath(:for) do |locator, options|
     xpath = XPath.descendant(:label)
-    xpath = xpath[XPath.string.n.is(locator.to_s) | XPath.attr(:id).equals(locator.to_s)] unless locator.nil?
+    xpath = xpath[XPath.string.n.is(locator.to_s).or XPath.attr(:id).equals(locator.to_s)] unless locator.nil?
     if options.has_key?(:for) && !options[:for].is_a?(Capybara::Node::Element)
       xpath = xpath[XPath.attr(:for).equals(options[:for].to_s).or((~XPath.attr(:for)).and(XPath.descendant()[XPath.attr(:id).equals(options[:for].to_s)]))]
     end
@@ -484,7 +505,7 @@ end
 Capybara.add_selector(:table) do
   xpath(:caption) do |locator, options|
     xpath = XPath.descendant(:table)
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.descendant(:caption).is(locator.to_s)] unless locator.nil?
+    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.descendant(:caption).is(locator.to_s)] unless locator.nil?
     xpath = xpath[XPath.descendant(:caption).equals(options[:caption])] if options[:caption]
     xpath
   end
@@ -507,9 +528,9 @@ end
 #
 Capybara.add_selector(:frame) do
   xpath(:name) do |locator, options|
-    xpath = XPath.descendant(:iframe) + XPath.descendant(:frame)
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s) | XPath.attr(:name).equals(locator)] unless locator.nil?
-    xpath = expression_filters.inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+    xpath = XPath.descendant(:iframe).union(XPath.descendant(:frame))
+    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.attr(:name).equals(locator)] unless locator.nil?
+    xpath = expression_filters.keys.inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
     xpath
   end