capybara 2.8.1 → 2.9.0

data/lib/capybara/queries/base_query.rb

@@ -8,15 +8,71 @@ module Capybara
       attr_reader :options
 
       def wait
-        if @options.has_key?(:wait)
-          @options[:wait] || 0
+        self.class.wait(options)
+      end
+
+      def self.wait(options)
+        options.fetch(:wait, Capybara.default_max_wait_time) || 0
+      end
+
+      ##
+      #
+      # Checks if a count of 0 is valid for the query
+      # Returns false if query does not have any count options specified.
+      #
+      def expects_none?
+        if COUNT_KEYS.any? { |k| options.has_key? k }
+          matches_count?(0)
         else
-          Capybara.default_max_wait_time
+          false
         end
       end
 
+      ##
+      #
+      # Checks if the given count matches the query count options.
+      # Defaults to true if no count options are specified. If multiple
+      # count options exist, it tests that all conditions are met;
+      # however, if :count is specified, all other options are ignored.
+      #
+      # @param [Integer] count     The actual number. Should be coercible via Integer()
+      #
+      def matches_count?(count)
+        return (Integer(options[:count]) == count)     if options[:count]
+        return false if options[:maximum] && (Integer(options[:maximum]) < count)
+        return false if options[:minimum] && (Integer(options[:minimum]) > count)
+        return false if options[:between] && !(options[:between] === count)
+        return true
+      end
+
+      ##
+      #
+      # Generates a failure message from the query description and count options.
+      #
+      def failure_message
+        String.new("expected to find #{description}") << count_message
+      end
+
+      def negative_failure_message
+        String.new("expected not to find #{description}") << count_message
+      end
+
       private
 
+      def count_message
+        message = String.new()
+        if options[:count]
+          message << " #{options[:count]} #{Capybara::Helpers.declension('time', 'times', options[:count])}"
+        elsif options[:between]
+          message << " between #{options[:between].first} and #{options[:between].last} times"
+        elsif options[:maximum]
+          message << " at most #{options[:maximum]} #{Capybara::Helpers.declension('time', 'times', options[:maximum])}"
+        elsif options[:minimum]
+          message << " at least #{options[:minimum]} #{Capybara::Helpers.declension('time', 'times', options[:minimum])}"
+        end
+        message
+      end
+
       def assert_valid_keys
         invalid_keys = @options.keys - valid_keys
         unless invalid_keys.empty?

data/lib/capybara/queries/selector_query.rb

@@ -4,7 +4,7 @@ module Capybara
     class SelectorQuery < Queries::BaseQuery
       attr_accessor :selector, :locator, :options, :expression, :find, :negative
 
-      VALID_KEYS = [:text, :visible, :between, :count, :maximum, :minimum, :exact, :match, :wait, :filter_set]
+      VALID_KEYS = COUNT_KEYS + [:text, :visible, :exact, :match, :wait, :filter_set]
       VALID_MATCH = [:first, :smart, :prefer_exact, :one]
 
       def initialize(*args)
@@ -26,7 +26,7 @@ module Capybara
           @options[:exact] = true
         end
 
-        @expression = @selector.call(@locator)
+        @expression = @selector.call(@locator, @options)
 
         warn_exact_usage
 
@@ -83,23 +83,15 @@ module Capybara
 
       def exact?
         return false if !supports_exact?
-        if options.has_key?(:exact)
-          @options[:exact]
-        else
-          Capybara.exact
-        end
+        options.fetch(:exact, Capybara.exact)
       end
 
       def match
-        if options.has_key?(:match)
-          @options[:match]
-        else
-          Capybara.match
-        end
+        options.fetch(:match, Capybara.match)
       end
 
       def xpath(exact=nil)
-        exact = self.exact? if exact == nil
+        exact = self.exact? if exact.nil?
         if @expression.respond_to?(:to_xpath) and exact
           @expression.to_xpath(:exact)
         else
@@ -137,8 +129,7 @@ module Capybara
       private
 
       def valid_keys
-       vk = COUNT_KEYS + [:text, :visible, :exact, :match, :wait, :filter_set]
-       vk + custom_keys
+        VALID_KEYS + custom_keys
       end
 
       def query_filters
@@ -150,7 +141,7 @@ module Capybara
       end
 
       def custom_keys
-        query_filters.keys
+        query_filters.keys + @selector.expression_filters
       end
 
       def assert_valid_keys

data/lib/capybara/queries/text_query.rb

@@ -22,24 +22,25 @@ module Capybara
       end
 
       def failure_message
-        build_message(true)
+        super << build_message(true)
       end
 
       def negative_failure_message
-        build_message(false).sub(/(to find)/, 'not \1')
+        super << build_message(false)
+      end
+
+      def description
+        if @expected_text.is_a?(Regexp)
+          "text matching #{@expected_text.inspect}"
+        else
+          "text #{@expected_text.inspect}"
+        end
       end
 
       private
 
       def build_message(report_on_invisible)
-        description =
-          if @expected_text.is_a?(Regexp)
-            "text matching #{@expected_text.inspect}"
-          else
-            "text #{@expected_text.inspect}"
-          end
-
-        message = Capybara::Helpers.failure_message(description, @options)
+        message = String.new()
         unless (COUNT_KEYS & @options.keys).empty?
           message << " but found #{@count} #{Capybara::Helpers.declension('time', 'times', @count)}"
         end

data/lib/capybara/rack_test/form.rb

@@ -42,7 +42,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
               if (value = field['value']).to_s.empty?
                 NilUploadedFile.new
               else
-                content_type = MIME::Types.type_for(value).first.to_s
+                types = MIME::Types.type_for(value)
+                content_type = types.sort_by.with_index { |type, idx| [type.obsolete? ? 1 : 0, idx] }.first.to_s
                 Rack::Test::UploadedFile.new(value, content_type)
               end
             merge_param!(params, field['name'].to_s, file)

data/lib/capybara/result.rb

@@ -45,7 +45,7 @@ module Capybara
     end
 
     def [](*args)
-      if (args.size == 1) && ((idx = args[0]).is_a? Integer) && (idx > 0)
+      if (args.size == 1) && ((idx = args[0]).is_a? Integer) && (idx >= 0)
         @result_cache << @results_enum.next while @result_cache.size <= idx
         @result_cache[idx]
       else
@@ -61,31 +61,48 @@ module Capybara
     end
 
     def matches_count?
-      return Integer(@query.options[:count]) == count if @query.options[:count]
-
-      return false if @query.options[:between] && !(@query.options[:between] === count)
+      # Only check filters for as many elements as necessary to determine result
+      if @query.options[:count]
+        count_opt = Integer(@query.options[:count])
+        loop do
+          break if @result_cache.size > count_opt
+          @result_cache << @results_enum.next
+        end
+        return @result_cache.size == count_opt
+      end
 
       if @query.options[:minimum]
+        min_opt = Integer(@query.options[:minimum])
         begin
-          @result_cache << @results_enum.next while @result_cache.size < Integer(@query.options[:minimum])
+          @result_cache << @results_enum.next while @result_cache.size < min_opt
         rescue StopIteration
           return false
         end
       end
 
       if @query.options[:maximum]
+        max_opt = Integer(@query.options[:maximum])
         begin
-          @result_cache << @results_enum.next while @result_cache.size <= Integer(@query.options[:maximum])
+          @result_cache << @results_enum.next while @result_cache.size <= max_opt
           return false
         rescue StopIteration
         end
       end
 
+      if @query.options[:between]
+        max =  Integer(@query.options[:between].max)
+        loop do
+          break if @result_cache.size > max
+          @result_cache << @results_enum.next
+        end
+        return false unless (@query.options[:between] === @result_cache.size)
+      end
+
       return true
     end
 
     def failure_message
-      message = Capybara::Helpers.failure_message(@query.description, @query.options)
+      message = @query.failure_message
       if count > 0
         message << ", found #{count} #{Capybara::Helpers.declension("match", "matches", count)}: " << full_results.map(&:text).map(&:inspect).join(", ")
       else
@@ -105,9 +122,7 @@ module Capybara
     private
 
     def full_results
-      loop do
-        @result_cache << @results_enum.next
-      end
+      loop { @result_cache << @results_enum.next }
       @result_cache
     end
 

data/lib/capybara/rspec/features.rb

@@ -39,7 +39,6 @@ else
     end
   end
 
-
   def self.feature(*args, &block)
     options = if args.last.is_a?(Hash) then args.pop else {} end
     options[:capybara_feature] = true
@@ -51,5 +50,7 @@ else
     RSpec.describe(*args, &block)
   end
 
-  RSpec.configuration.include Capybara::Features, :capybara_feature => true
+  RSpec.configure do |config|
+    config.include(Capybara::Features, :capybara_feature => true)
+  end
 end

data/lib/capybara/rspec/matchers.rb

@@ -161,7 +161,7 @@ module Capybara
 
     class BecomeClosed
       def initialize(options)
-        @wait_time = Capybara::Queries::SelectorQuery.new(options).wait
+        @wait_time = Capybara::Queries::BaseQuery.wait(options)
       end
 
       def matches?(window)

data/lib/capybara/selector.rb

@@ -1,188 +1,134 @@
 # frozen_string_literal: true
-require 'capybara/selector/filter_set'
-
-module Capybara
-  class Selector
-
-    attr_reader :name, :format
-
-    class << self
-      def all
-        @selectors ||= {}
-      end
-
-      def add(name, &block)
-        all[name.to_sym] = Capybara::Selector.new(name.to_sym, &block)
-      end
-
-      def update(name, &block)
-        all[name.to_sym].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
-      instance_eval(&block)
-    end
-
-    def custom_filters
-      @filter_set.filters
-    end
-
-    def xpath(&block)
-      @format, @expression = :xpath, block if block
-      format == :xpath ? @expression : nil
-    end
-
-    def css(&block)
-      @format, @expression = :css, block if block
-      format == :css ? @expression : nil
-    end
-
-    def match(&block)
-      @match = block if block
-      @match
-    end
-
-    def label(label=nil)
-      @label = label if label
-      @label
-    end
-
-    def description(options={})
-      @filter_set.description(options)
-    end
-
-    def call(locator)
-      if format
-        @expression.call(locator)
-      else
-        warn "Selector has no format"
-      end
-    end
-
-    def match?(locator)
-      @match and @match.call(locator)
-    end
-
-    def filter(name, options={}, &block)
-      custom_filters[name] = Filter.new(name, block, options)
-    end
-
-    def filter_set(name, filters_to_use = nil)
-      f_set = FilterSet.all[name]
-      f_set.filters.each do | name, filter |
-        custom_filters[name] = filter if filters_to_use.nil? || filters_to_use.include?(name)
-      end
-      f_set.descriptions.each { |desc| @filter_set.describe &desc }
-    end
-
-    def describe &block
-      @filter_set.describe &block
-    end
-
-    private
-
-    def locate_field(xpath, locator)
-      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
+require 'capybara/selector/selector'
+Capybara::Selector::FilterSet.add(:_field) do
+  filter(:checked, :boolean) { |node, value| not(value ^ node.checked?) }
+  filter(:unchecked, :boolean) { |node, value| (value ^ node.checked?) }
+  filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
+  filter(:multiple, :boolean) { |node, value| !(value ^ node.multiple?) }
 
-      locate_field = xpath[attr_matchers]
-      locate_field += XPath.descendant(:label)[XPath.string.n.is(locator)].descendant(xpath)
-      locate_field
-    end
+  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
+    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
+    desc
   end
 end
 
+##
+#
+# Select elements by XPath expression
+#
+# @locator An XPath expression
+#
 Capybara.add_selector(:xpath) do
   xpath { |xpath| xpath }
 end
 
+##
+#
+# Select elements by CSS selector
+#
+# @locator A CSS selector
+#
 Capybara.add_selector(:css) do
   css { |css| css }
 end
 
+##
+#
+# Select element by id
+#
+# @locator The id of the element to match
+#
 Capybara.add_selector(:id) do
   xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
 end
 
-Capybara::Selector::FilterSet.add(:_field) do
-  filter(:id) { |node, id| node['id'] == id }
-  filter(:name) { |node, name| node['name'] == name }
-  filter(:placeholder) { |node, placeholder| node['placeholder'] == placeholder }
-  filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
-  filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
-  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
-  filter(:multiple, boolean: true) { |node, value| !(value ^ node.multiple?) }
-
-  describe do |options|
-    desc, states = String.new, []
-    [:id, :name, :placeholder].each do |opt|
-      desc << " with #{opt.to_s} #{options[opt]}" if options.has_key?(opt)
-    end
-    states << 'checked' if options[:checked] || (options[:unchecked] === false)
-    states << 'not checked' if options[:unchecked] || (options[:checked] === false)
-    states << 'disabled' if options[:disabled] == true
-    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
-    desc
-  end
-end
-
+##
+#
+# Select field elements (input [not of type submit, image, or hidden], textarea, select)
+#
+# @locator Matches against the id, name, or placeholder
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :name  Matches the name attribute
+# @filter [String] :placeholder  Matches the placeholder attribute
+# @filter [String] :type Matches the type attribute of the field or element type for 'textarea' and 'select'
+# @filter [Boolean] :readonly
+# @filter [String] :with  Matches the current value of the field
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+# @filter [Boolean] :checked Match checked fields?
+# @filter [Boolean] :unchecked Match unchecked fields?
+# @filter [Boolean] :disabled Match disabled field?
+# @filter [Boolean] :multiple Match fields that accept multiple values
 Capybara.add_selector(:field) do
-  xpath do |locator|
+  xpath(:id, :name, :placeholder, :type, :class) do |locator, options|
     xpath = XPath.descendant(:input, :textarea, :select)[~XPath.attr(:type).one_of('submit', 'image', 'hidden')]
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
+    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
+    end
+    xpath=locate_field(xpath, locator, options)
     xpath
   end
 
-  filter_set(:_field)
+  filter_set(:_field) # checked/unchecked/disabled/multiple
 
-  filter(:readonly, boolean: true) { |node, value| not(value ^ node.readonly?) }
+  filter(:readonly, :boolean) { |node, value| not(value ^ node.readonly?) }
   filter(:with) do |node, with|
     with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
   end
-  filter(:type) do |node, type|
-    type = type.to_s
-    if ['textarea', 'select'].include?(type)
-      node.tag_name == type
-    else
-      node[:type] == type
-    end
-  end
   describe do |options|
-    desc, states = String.new, []
+    desc = String.new
+    (expression_filters - [:type]).each { |ef| desc << " with #{ef.to_s} #{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
   end
 end
 
+##
+#
+# Select fieldset elements
+#
+# @locator Matches id or contents of wrapped legend
+#
+# @filter [String] :id Matches id attribute
+# @filter [String] :legend Matches contents of wrapped legend
+# @filter [String, Array<String>] :class Matches the class(es) provided
+#
 Capybara.add_selector(:fieldset) do
-  xpath do |locator|
+  xpath(:id, :legend, :class) 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(options[:id])] if options[:id]
+    xpath = xpath[XPath.child(:legend)[XPath.string.n.is(options[:legend])]] if options[:legend]
+    xpath = xpath[find_by_attr(:class, options[:class])]
     xpath
   end
 end
 
+##
+#
+# Find links ( <a> elements with an href attribute )
+#
+# @locator Matches the id or title attributes, or the string content of the link, or the alt attribute of a contained img element
+#
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :title Matches the title attribute
+# @filter [String] :alt Matches the alt attribute of a contained img element
+# @filter [String] :class Matches the class(es) provided
+# @filter [String, Regexp] :href  Matches the normalized href of the link
+#
 Capybara.add_selector(:link) do
-  xpath do |locator|
+  xpath(:id, :title, :alt, :class) do |locator, options={}|
     xpath = XPath.descendant(:a)[XPath.attr(:href)]
     unless locator.nil?
       locator = locator.to_s
@@ -193,6 +139,8 @@ Capybara.add_selector(:link) do
       matchers |= XPath.attr(:'aria-label').is(locator) if Capybara.enable_aria_label
       xpath = xpath[matchers]
     end
+    xpath = [:id, :title, :class].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+    xpath = xpath[XPath.descendant(:img)[XPath.attr(:alt).equals(options[:alt])]] if options[:alt]
     xpath
   end
 
@@ -207,8 +155,19 @@ Capybara.add_selector(:link) do
   describe { |options| " with href #{options[:href].inspect}" if options[:href] }
 end
 
+##
+#
+#  Find buttons ( input [of type submit, reset, image, button] or button elements )
+#
+# @locator Matches the id, value, or title attributes, string content of a button, or the alt attribute of an image type button
+#
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :title Matches the title attribute
+# @filter [String] :class Matches the class(es) provided
+# @filter [String] :value Matches the value of an input button
+#
 Capybara.add_selector(:button) do
-  xpath do |locator|
+  xpath(:id, :value, :title, :class) do |locator, options={}|
     input_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).one_of('submit', 'reset', 'image', 'button')]
     btn_xpath = XPath.descendant(:button)
     image_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).equals('image')]
@@ -227,82 +186,158 @@ Capybara.add_selector(:button) do
       image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
-    input_btn_xpath + btn_xpath + image_btn_xpath
+    res_xpath = input_btn_xpath + btn_xpath + image_btn_xpath
+
+    res_xpath = expression_filters.inject(res_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
+
+    res_xpath
   end
 
-  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
 
-  describe { |options| " that is disabled" if options[:disabled] == true }
+  describe do |options|
+    desc = String.new
+    desc << " that is disabled" if options[:disabled] == true
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc
+  end
 end
 
+##
+#
+# Find links or buttons
+#
 Capybara.add_selector(:link_or_button) do
   label "link or button"
-  xpath do |locator|
-    self.class.all.values_at(:link, :button).map {|selector| selector.xpath.call(locator)}.reduce(:+)
+  xpath do |locator, options|
+    self.class.all.values_at(:link, :button).map {|selector| selector.xpath.call(locator, options)}.reduce(:+)
   end
 
-  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| node.tag_name == "a" or not(value ^ node.disabled?) }
+  filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| node.tag_name == "a" or not(value ^ node.disabled?) }
 
   describe { |options| " that is disabled" if options[:disabled] }
 end
 
+##
+#
+# Find text fillable fields ( textarea, input [not of type submit, image, radio, checkbox, hidden, file] )
+#
+# @locator Matches against the id, name, or placeholder
+# @filter [String] :id  Matches the id attribute
+# @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, 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 do |locator|
+  xpath(:id, :name, :placeholder, :class) do |locator, options|
     xpath = XPath.descendant(:input, :textarea)[~XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
-    xpath
+    locate_field(xpath, locator, options)
+  end
+
+  filter_set(:_field, [:disabled, :multiple])
+
+  filter(:with) do |node, with|
+    with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
   end
 
-  filter_set(:_field, [:id, :name, :placeholder, :disabled, :multiple])
+  describe do |options|
+    desc = String.new
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
+    desc
+  end
 end
 
+##
+#
+# Find radio buttons
+#
+# @locator Match id, name, or associated label text
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :name  Matches the name attribute
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+# @filter [Boolean] :checked Match checked fields?
+# @filter [Boolean] :unchecked Match unchecked fields?
+# @filter [Boolean] :disabled Match disabled field?
+# @filter [String] :option Match the value
+#
 Capybara.add_selector(:radio_button) do
   label "radio button"
-  xpath do |locator|
+  xpath(:id, :name, :class) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('radio')]
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
-    xpath
+    locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:id, :name, :checked, :unchecked, :disabled])
+  filter_set(:_field, [:checked, :unchecked, :disabled])
 
   filter(:option)  { |node, value|  node.value == value.to_s }
 
   describe do |options|
     desc = String.new
     desc << " with value #{options[:option].inspect}" if options[:option]
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
     desc
   end
 end
 
+##
+#
+# Find checkboxes
+#
+# @locator Match id, name, or associated label text
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :name  Matches the name attribute
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+# @filter [Boolean] :checked Match checked fields?
+# @filter [Boolean] :unchecked Match unchecked fields?
+# @filter [Boolean] :disabled Match disabled field?
+# @filter [String] :option Match the value
+#
 Capybara.add_selector(:checkbox) do
-  xpath do |locator|
+  xpath(:id, :name, :class) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('checkbox')]
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
-    xpath
+    locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:id, :name, :checked, :unchecked, :disabled])
+  filter_set(:_field, [:checked, :unchecked, :disabled])
 
   filter(:option)  { |node, value|  node.value == value.to_s }
 
   describe do |options|
     desc = String.new
     desc << " with value #{options[:option].inspect}" if options[:option]
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
     desc
   end
 end
 
+##
+#
+# Find select elements
+#
+# @locator Match id, name, placeholder, or associated label text
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :name  Matches the name attribute
+# @filter [String] :placeholder  Matches the placeholder attribute
+# @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
+# @filter [Array<String>] :options Exact match options
+# @filter [Array<String>] :with_options Partial match options
+# @filter [String, Array<String>] :selected Match the selection(s)
+#
 Capybara.add_selector(:select) do
   label "select box"
-  xpath do |locator|
+  xpath(:id, :name, :placeholder, :class) do |locator, options|
     xpath = XPath.descendant(:select)
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
-    xpath
+    locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:id, :name, :placeholder, :disabled, :multiple])
+  filter_set(:_field, [:disabled, :multiple])
 
   filter(:options) do |node, options|
     if node.visible?
@@ -329,10 +364,19 @@ 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]
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
     desc
   end
 end
 
+##
+#
+# Find option elements
+#
+# @locator Match text of option
+# @filter [Boolean] :disabled Match disabled option
+# @filter [Boolean] :selected Match selected option
+#
 Capybara.add_selector(:option) do
   xpath do |locator|
     xpath = XPath.descendant(:option)
@@ -340,8 +384,8 @@ Capybara.add_selector(:option) do
     xpath
   end
 
-  filter(:disabled, boolean: true) { |node, value| not(value ^ node.disabled?) }
-  filter(:selected, boolean: true) { |node, value| not(value ^ node.selected?) }
+  filter(:disabled, :boolean) { |node, value| not(value ^ node.disabled?) }
+  filter(:selected, :boolean) { |node, value| not(value ^ node.selected?) }
 
   describe do |options|
     desc = String.new
@@ -351,17 +395,40 @@ Capybara.add_selector(:option) do
   end
 end
 
+##
+#
+# Find file input elements
+#
+# @locator Match id, name, or associated label text
+# @filter [String] :id  Matches the id attribute
+# @filter [String] :name  Matches the name attribute
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+# @filter [Boolean] :disabled Match disabled field?
+# @filter [Boolean] :multiple Match field that accepts multiple values
+#
 Capybara.add_selector(:file_field) do
   label "file field"
-  xpath do |locator|
+  xpath(:id, :name, :class) do |locator, options|
     xpath = XPath.descendant(:input)[XPath.attr(:type).equals('file')]
-    xpath = locate_field(xpath, locator.to_s) unless locator.nil?
-    xpath
+    locate_field(xpath, locator, options)
   end
 
-  filter_set(:_field, [:id, :name, :disabled, :multiple])
+  filter_set(:_field, [:disabled, :multiple])
+
+  describe do |options|
+    desc = String.new
+    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc
+  end
 end
 
+##
+#
+# Find label elements
+#
+# @locator Match id or text contents
+# @filter [Element, String] :for The element or id of the element associated with the label
+#
 Capybara.add_selector(:label) do
   label "label"
   xpath do |locator|
@@ -389,18 +456,53 @@ Capybara.add_selector(:label) do
   end
 end
 
+##
+#
+# Find table elements
+#
+# @locator id or caption text of table
+# @filter [String] :id Match id attribute of table
+# @filter [String] :caption Match text of associated caption
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+#
 Capybara.add_selector(:table) do
-  xpath do |locator|
+  xpath(:id, :caption, :class) 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.descendant(:caption).equals(options[:caption])] if options[:caption]
+    xpath = [:id, :class].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
     xpath
   end
+
+  describe do |options|
+    desc = String.new
+    desc << " with id #{options[:id]}" if options[:id]
+    desc << " with caption #{options[:caption]}" if options[:caption]
+    desc
+  end
 end
 
+##
+#
+# Find frame/iframe elements
+#
+# @locator Match id or name
+# @filter [String] :id Match id attribute
+# @filter [String] :name Match name attribute
+# @filter [String, Array<String>] :class  Matches the class(es) provided
+#
 Capybara.add_selector(:frame) do
-  xpath do |locator|
+  xpath(:id, :name, :class) 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
   end
+
+  describe do |options|
+    desc = String.new
+    desc << " with id #{options[:id]}" if options[:id]
+    desc << " with name #{options[:name]}" if options[:name]
+    desc
+  end
 end