capybara 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3213dfe8f170fe23b4374001be7b721b00ce9ff7
-  data.tar.gz: aaebf44440aff65f3183728e404bb07660e606e5
+  metadata.gz: b7503b0ca48f7ee15c40c1baacb2e4147aeda674
+  data.tar.gz: 0da9283932e38baf19334f06cb94cd3eeaf5acdf
 SHA512:
-  metadata.gz: 1624de546eb1f2f56b5dfc38a8a4f597aa930d1db0101ce6f712deb7d15abc31845385b4b18971cfe0d76328d45c8c478109af1de1584c86c64a4f6c30dc550c
-  data.tar.gz: 21b3438ac351b7a70d642001fb15e429fac7ff3df7eb01f56c04141c5e603bf12dfb1368a408924ee9d6ebb0450cc8397bcab92d4eb9b9242eaac63d7390808e
+  metadata.gz: 388e135a8d62498ae35e0f0ae289a0f78cef7ebd2f522197926a3c0a4fa68e67f548aba020ff513dde67dba3ef899685ce7cac49246a647be432f43cdd6bf697
+  data.tar.gz: b31b4c8ee11655e952d746ccd44ac228b8d0f739bb684c2e5bbbc80c961219bbbb380570e1adc0e4dc272d7c6081df5f74ab03f5bdf5ca7df8b3b14df7f63d60

data/History.md

@@ -1,3 +1,22 @@
+# Version 2.6.0
+Relase date: 2016-01-17
+
+### Fixed
+* Fixed path escaping issue with current_path matchers [Tom Walpole, Luke Rollans] (Issue #1611)
+* Fixed circular require [David Rodríguez]
+* Capybara::RackTest::Form no longer overrides Object#method [David Rodriguez]
+* options and with_options filter for :select selector have more intuitive visibility behavior [Nathan]
+* Test for nested modal API method support [Tom Walpole]
+
+
+### Added
+* Capybara.modify_selector [Tom Walpole]
+* xfeature and ffeature aliases added when using RSpec [Filip Bartuzi]
+* Selenium driver supports a :clear option to #set to handle different strategies for clearing a field [Tom Walpole]
+* Support the use of rack 2.0 with the rack_test driver [Travis Grathwell, Tom Walpole]
+* Disabled option for default selectors now supports true, false, or :all [Jillian Rosile, Tom Walpole]
+* Modal API methods now default wait time to Capybara.max_default_wait_time [Tom Walpole]
+
 # Version 2.5.0
 Release date: 2015-08-25
 
@@ -12,7 +31,6 @@ Release date: 2015-08-25
 * Implement Node#path in selenium driver [Soutaro Matsumoto]
 * 'using_session' is now nestable [Tom Walpole]
 * 'switch_to_window' will now use waiting behavior for a matching window to appear [Tom Walpole]
-* Capybara.default_wait_time deprecated in favor of Capybara.default_max_wait_time to more clearly explain its purpose [Paul Pettengill]
 * Warning when attempting to select a disabled option
 * Capybara matchers are now available in RSpec view specs by default [Joshua Clayton]
 * 'have_link' and 'click_link' now accept Regexp for href matching [Yaniv Savir]
@@ -25,6 +43,9 @@ Release date: 2015-08-25
 * 'formmethod' attribute support in RackTest driver [Emilia Andrzejewska]
 * Clear field using backspaces in Selenium driver by using `:fill_options => { :clear => :backspace }` [Joe Lencioni]
 
+### Deprecated
+* Capybara.default_wait_time deprecated in favor of Capybara.default_max_wait_time to more clearly explain its purpose [Paul Pettengill]
+
 #Version 2.4.4
 Release date: 2014-10-13
 

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2009-2012 Jonas Nicklas
+Copyright (c) 2009-2016 Jonas Nicklas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,8 @@
 # Capybara
 
-[![Build Status](https://secure.travis-ci.org/jnicklas/capybara.png)](http://travis-ci.org/jnicklas/capybara)
-[![Dependency Status](https://gemnasium.com/jnicklas/capybara.png)](https://gemnasium.com/jnicklas/capybara)
-[![Code Climate](https://codeclimate.com/github/jnicklas/capybara.png)](https://codeclimate.com/github/jnicklas/capybara)
+[![Build Status](https://secure.travis-ci.org/jnicklas/capybara.svg)](https://travis-ci.org/jnicklas/capybara)
+[![Dependency Status](https://gemnasium.com/jnicklas/capybara.svg)](https://gemnasium.com/jnicklas/capybara)
+[![Code Climate](https://codeclimate.com/github/jnicklas/capybara.svg)](https://codeclimate.com/github/jnicklas/capybara)
 
 Capybara helps you test web applications by simulating how a real user would
 interact with your app. It is agnostic about the driver running your tests and
@@ -69,6 +69,8 @@ Capybara requires Ruby 1.9.3 or later. To install, add this line to your
 gem 'capybara'
 ```
 
+**Note:** If using Ruby < 2.0 you will also need to limit the version of mime-types to < 3.0
+
 If the application that you are testing is a Rails app, add this line to your test helper file:
 
 ```ruby
@@ -131,7 +133,11 @@ Load RSpec 2.x support by adding the following line (typically to your
 require 'capybara/rspec'
 ```
 
-If you are using Rails, put your Capybara specs in `spec/features`.
+If you are using Rails, put your Capybara specs in `spec/features` (only works
+if [you have it configured in
+rpsec](https://www.relishapp.com/rspec/rspec-rails/docs/upgrade#file-type-inference-disabled))
+and if you have your Capybara specs in a different directory, then tag the
+example groups with `:type => :feature`.
 
 If you are not using Rails, tag all the example groups in which you want to use
 Capybara with `:type => :feature`.
@@ -367,7 +373,7 @@ Capybara.javascript_driver = :webkit
 
 ### Poltergeist
 
-[Poltergeist](https://github.com/jonleighton/poltergeist) is another
+[Poltergeist](https://github.com/teampoltergeist/poltergeist) is another
 headless driver which integrates Capybara with
 [PhantomJS](http://phantomjs.org/). It is truly headless, so doesn't
 require Xvfb to run on your CI server. It will also detect and report
@@ -399,12 +405,17 @@ The visit method only takes a single parameter, the request method is **always**
 GET.
 
 You can get the [current path](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Session#current_path-instance_method)
-of the browsing session for test assertions:
+of the browsing session, and test it using the [`have_current_path`](http://www.rubydoc.info/github/jnicklas/capybara/master/Capybara/RSpecMatchers#have_current_path-instance_method) matcher:
 
 ```ruby
-expect(current_path).to eq(post_comments_path(post))
+expect(page).to have_current_path(post_comments_path(post))
 ```
 
+**Note**: You can also assert the current path by testing the value of
+`current_path` directly. However, using the `have_current_path` matcher is
+safer since it uses Capybara's [waiting behaviour](#asynchronous-javascript-ajax-and-friends)
+to ensure that preceding actions (such as a `click_link`) have completed.
+
 ### Clicking links and buttons
 
 *Full reference: [Capybara::Node::Actions](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Actions)*
@@ -682,24 +693,7 @@ your test code to be invisible to Capybara.
 
 Cucumber handles this by using truncation instead of transactions, i.e. they
 empty out the entire database after each test. You can get the same behaviour
-by using a gem such as [database_cleaner](https://github.com/bmabey/database_cleaner).
-
-It is also possible to force your ORM to use the same transaction for all
-threads.  This may have thread safety implications and could cause strange
-failures, so use caution with this approach. It can be implemented in
-ActiveRecord through the following monkey patch:
-
-```ruby
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
-```
+by using a gem such as [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner).
 
 ## Asynchronous JavaScript (Ajax and friends)
 
@@ -769,7 +763,6 @@ You can mix the DSL into any context by including <tt>Capybara::DSL</tt>:
 
 
 ```ruby
-require 'capybara'
 require 'capybara/dsl'
 
 Capybara.default_driver = :webkit
@@ -938,7 +931,7 @@ Whatever is returned from the block should conform to the API described by
 Capybara::Driver::Base, it does not however have to inherit from this class.
 Gems can use this API to add their own drivers to Capybara.
 
-The [Selenium wiki](http://code.google.com/p/selenium/wiki/RubyBindings) has
+The [Selenium wiki](https://github.com/SeleniumHQ/selenium/wiki/Ruby-Bindings) has
 additional info about how the underlying driver can be configured.
 
 ## Gotchas:
@@ -957,7 +950,7 @@ additional info about how the underlying driver can be configured.
   since Capybara's Ajax timing uses the system time, resulting in Capybara
   never timing out and just hanging when a failure occurs. It's still possible to
   use gems which allow you to travel in time, rather than freeze time.
-  One such gem is [Timecop](http://github.com/travisjeffery/timecop).
+  One such gem is [Timecop](https://github.com/travisjeffery/timecop).
 
 * When using Rack::Test, beware if attempting to visit absolute URLs. For
   example, a session might not be shared between visits to `posts_path`

data/lib/capybara.rb

@@ -37,24 +37,24 @@ module Capybara
     #
     # === Configurable options
     #
-    # [app_host = String]                 The default host to use when giving a relative URL to visit  
-    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)  
-    # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)  
-    # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)  
-    # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)  
-    # [server_errors = Array\<Class\>]    Error classes that should be raised in the tests if they are raised in the server and Capybara.raise_server_errors is true (Default: [StandardError])  
-    # [default_selector = :css/:xpath]    Methods which take a selector use the given type by default (Default: :css)  
-    # [default_max_wait_time = Numeric]   The maximum number of seconds to wait for asynchronous processes to finish (Default: 2)  
-    # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: true)  
-    # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)  
-    # [save_and_open_page_path = String]  Where to put pages saved through save_and_open_page (Default: Dir.pwd)  
-    # [wait_on_first_by_default = Boolean]   Whether Node#first defaults to Capybara waiting behavior for at least 1 element to match (Default: false) 
+    # [app_host = String]                 The default host to use when giving a relative URL to visit
+    # [always_include_port = Boolean]     Whether the Rack server's port should automatically be inserted into every visited URL (Default: false)
+    # [asset_host = String]               Where dynamic assets are hosted - will be prepended to relative asset locations if present (Default: nil)
+    # [run_server = Boolean]              Whether to start a Rack server for the given Rack app (Default: true)
+    # [raise_server_errors = Boolean]     Should errors raised in the server be raised in the tests? (Default: true)
+    # [server_errors = Array\<Class\>]    Error classes that should be raised in the tests if they are raised in the server and Capybara.raise_server_errors is true (Default: [StandardError])
+    # [default_selector = :css/:xpath]    Methods which take a selector use the given type by default (Default: :css)
+    # [default_max_wait_time = Numeric]   The maximum number of seconds to wait for asynchronous processes to finish (Default: 2)
+    # [ignore_hidden_elements = Boolean]  Whether to ignore hidden elements on the page (Default: true)
+    # [automatic_reload = Boolean]        Whether to automatically reload elements as Capybara is waiting (Default: true)
+    # [save_and_open_page_path = String]  Where to put pages saved through save_and_open_page (Default: Dir.pwd)
+    # [wait_on_first_by_default = Boolean]   Whether Node#first defaults to Capybara waiting behavior for at least 1 element to match (Default: false)
     # === DSL Options
     #
     # when using capybara/dsl, the following options are also available:
     #
-    # [default_driver = Symbol]           The name of the driver to use by default. (Default: :rack_test)  
-    # [javascript_driver = Symbol]        The name of a driver to use for JavaScript enabled tests. (Default: :selenium)  
+    # [default_driver = Symbol]           The name of the driver to use by default. (Default: :rack_test)
+    # [javascript_driver = Symbol]        The name of a driver to use for JavaScript enabled tests. (Default: :selenium)
     #
     def configure
       yield self
@@ -109,6 +109,23 @@ module Capybara
       Capybara::Selector.add(name, &block)
     end
 
+    ##
+    #
+    # Modify a selector previously craeated by {Capybara.add_selector}.
+    # For example modifying the :button selector to also find divs styled
+    # to look like buttons might look like this
+    #
+    #     Capybara.modfiy_selector(:button) do
+    #       xpath { |locator| XPath::HTML.button(locator).or(XPath::css('div.btn')[XPath::string.n.is(locator)]) }
+    #     end
+    #
+    # @param [Symbol] name    The name of the selector to modify
+    # @yield                  A block executed in the context of the existing {Capybara::Selector}
+    #
+    def modify_selector(name, &block)
+      Capybara::Selector.update(name, &block)
+    end
+
     def drivers
       @drivers ||= {}
     end
@@ -140,7 +157,16 @@ module Capybara
     # in a {Capybara::Node::Simple} which exposes all {Capybara::Node::Matchers},
     # {Capybara::Node::Finders} and {Capybara::Node::DocumentMatchers}. This allows you to query
     # any string containing HTML in the exact same way you would query the current document in a Capybara
-    # session. For example:
+    # session.
+    #
+    # Example: A single element
+    #
+    #     node = Capybara.string('<a href="foo">bar</a>')
+    #     anchor = node.first('a')
+    #     anchor[:href] #=> 'foo'
+    #     anchor.text #=> 'bar'
+    #
+    # Example: Multiple elements
     #
     #     node = Capybara.string <<-HTML
     #       <ul>
@@ -296,13 +322,13 @@ module Capybara
         end
       end
     end
-    
+
     # @deprecated Use default_max_wait_time instead
     def default_wait_time
       deprecate('default_wait_time', 'default_max_wait_time', true)
       default_max_wait_time
     end
-    
+
     # @deprecated Use default_max_wait_time= instead
     def default_wait_time=(t)
       deprecate('default_wait_time=', 'default_max_wait_time=')
@@ -337,7 +363,6 @@ module Capybara
 
   require 'capybara/helpers'
   require 'capybara/session'
-  require 'capybara/dsl'
   require 'capybara/window'
   require 'capybara/server'
   require 'capybara/selector'
@@ -349,7 +374,7 @@ module Capybara
   require 'capybara/queries/text_query'
   require 'capybara/queries/title_query'
   require 'capybara/queries/current_path_query'
-  
+
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
   require 'capybara/node/actions'

data/lib/capybara/cucumber.rb

@@ -1,4 +1,4 @@
-require 'capybara'
+require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 
 World(Capybara::DSL)

data/lib/capybara/node/finders.rb

@@ -56,7 +56,10 @@ module Capybara
       #
       # @option options [Boolean] checked  Match checked field?
       # @option options [Boolean] unchecked   Match unchecked field?
-      # @option options [Boolean] disabled (false)  Match disabled field?
+      # @option options [Boolean, Symbol] disabled (false)  Match disabled field?
+      #                                                     * true - only finds a disabled field
+      #                                                     * false - only finds an enabled field
+      #                                                     * :all - finds either an enabled or disabled field
       # @option options [Boolean] readonly Match readonly field?
       # @option options [String] with   Value of field to match on
       # @option options [String] type   Type of field to match on
@@ -91,7 +94,10 @@ module Capybara
       # @macro waiting_behavior
       #
       # @param [String] locator             Which button to find
-      # @option options [Boolean] disabled (false)  Match disabled button?
+      # @option options [Boolean, Symbol] disabled (false)  Match disabled button?
+      #                                                     * true - only finds a disabled button
+      #                                                     * false - only finds an enabled button
+      #                                                     * :all - finds either an enabled or disabled button
       # @return [Capybara::Node::Element]   The found element
       #
       def find_button(locator, options={})

data/lib/capybara/queries/current_path_query.rb

@@ -15,16 +15,16 @@ module Capybara
           session.current_url
         else
           if options[:only_path]
-            URI.parse(session.current_url).path
+            Addressable::URI.parse(session.current_url).path
           else
-            URI.parse(session.current_url).request_uri
+            Addressable::URI.parse(session.current_url).request_uri
           end
         end
 
         if @expected_path.is_a? Regexp
           @actual_path.match(@expected_path)
         else
-          @expected_path == @actual_path
+          Addressable::URI.parse(@expected_path) == Addressable::URI.parse(@actual_path)
         end
       end
 

data/lib/capybara/rack_test/form.rb

@@ -15,15 +15,15 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
   end
 
   def params(button)
-    params = {}
+    params = make_params
 
     form_element_types=[:input, :select, :textarea]
-    form_elements_xpath=XPath.generate do |x| 
+    form_elements_xpath=XPath.generate do |x|
       xpath=x.descendant(*form_element_types).where(~x.attr(:form))
       xpath=xpath.union(x.anywhere(*form_element_types).where(x.attr(:form) == native[:id])) if native[:id]
       xpath.where(~x.attr(:disabled))
     end.to_s
-    
+
     native.xpath(form_elements_xpath).map do |field|
       case field.name
       when 'input'
@@ -31,7 +31,7 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           if field['checked']
             node=Capybara::RackTest::Node.new(self.driver, field)
             merge_param!(params, field['name'].to_s, node.value.to_s)
-          end          
+          end
         elsif %w(submit image).include? field['type']
           # TO DO identify the click button here (in document order, rather
           # than leaving until the end of the params)
@@ -67,13 +67,14 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]
-    params
+
+    params.to_params_hash
   end
 
   def submit(button)
     action = (button && button['formaction']) || native['action']
-    requset_method = (button && button['formmethod']) || method
-    driver.submit(requset_method, action.to_s, params(button))
+    method = (button && button['formmethod']) || request_method
+    driver.submit(method, action.to_s, params(button))
   end
 
   def multipart?
@@ -82,11 +83,29 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
 
 private
 
-  def method
+  class ParamsHash < Hash
+    def to_params_hash
+      self
+    end
+  end
+
+  def request_method
     self[:method] =~ /post/i ? :post : :get
   end
 
   def merge_param!(params, key, value)
-    Rack::Utils.normalize_params(params, key, value)
+    if Rack::Utils.respond_to?(:default_query_parser)
+      Rack::Utils.default_query_parser.normalize_params(params, key, value, Rack::Utils.param_depth_limit)
+    else
+      Rack::Utils.normalize_params(params, key, value)
+    end
+  end
+
+  def make_params
+    if Rack::Utils.respond_to?(:default_query_parser)
+      Rack::Utils.default_query_parser.make_params
+    else
+      ParamsHash.new
+    end
   end
 end

data/lib/capybara/rails.rb

@@ -1,4 +1,3 @@
-require 'capybara'
 require 'capybara/dsl'
 
 Capybara.app = Rack::Builder.new do

data/lib/capybara/rspec.rb

@@ -1,4 +1,3 @@
-require 'capybara'
 require 'capybara/dsl'
 require 'rspec/core'
 require 'capybara/rspec/matchers'

data/lib/capybara/rspec/features.rb

@@ -9,6 +9,8 @@ if RSpec::Core::Version::STRING.to_f >= 3.0
 
   RSpec.configure do |config|
     config.alias_example_group_to :feature, :capybara_feature => true, :type => :feature
+    config.alias_example_group_to :xfeature, :capybara_feature => true, :type => :feature, :skip => "Temporarily disabled with xfeature"
+    config.alias_example_group_to :ffeature, :capybara_feature => true, :type => :feature, :focus => true
     config.alias_example_to :scenario
     config.alias_example_to :xscenario, :skip => "Temporarily disabled with xscenario"
     config.alias_example_to :fscenario, :focus => true

data/lib/capybara/selector.rb

@@ -17,11 +17,25 @@ module Capybara
       end
 
       def matches?(node, value)
+        return true if skip?(value)
+
         if @options.has_key?(:valid_values) && !Array(@options[:valid_values]).include?(value)
-          warn "Invalid value #{value.inspect} passed to filter #{@name}"
+          msg = "Invalid value #{value.inspect} passed to filter #{@name} - "
+          if default?
+            warn msg + "defaulting to #{default}"
+            value = default
+          else
+            warn msg + "skipping"
+            return true
+          end
         end
+
         @block.call(node, value)
       end
+
+      def skip?(value)
+        @options.has_key?(:skip_if) && value == @options[:skip_if]
+      end
     end
 
     attr_reader :name, :custom_filters, :format
@@ -35,6 +49,10 @@ module Capybara
         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
@@ -51,15 +69,19 @@ module Capybara
     end
 
     def xpath(&block)
-      @format = :xpath
-      @xpath = block if block
+      if block
+        @format = :xpath
+        @xpath, @css = block, nil
+      end
       @xpath
     end
 
     # Same as xpath, but wrap in XPath.css().
     def css(&block)
-      @format = :css
-      @css = block if block
+      if block
+        @format = :css
+        @css, @xpath = block, nil
+      end
       @css
     end
 
@@ -115,7 +137,7 @@ Capybara.add_selector(:field) do
   xpath { |locator| XPath::HTML.field(locator) }
   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) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
   filter(:readonly, boolean: true) { |node, value| not(value ^ node[:readonly]) }
   filter(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
@@ -131,7 +153,7 @@ Capybara.add_selector(:field) do
     desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
     states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
     states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
-    states << 'disabled' if options[:disabled]
+    states << 'disabled' if options[:disabled] == true
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc
   end
@@ -162,15 +184,15 @@ end
 
 Capybara.add_selector(:button) do
   xpath { |locator| XPath::HTML.button(locator) }
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
-  describe { |options| " that is disabled" if options[:disabled] }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] == true }
 end
 
 Capybara.add_selector(:fillable_field) do
   label "field"
   xpath { |locator| XPath::HTML.fillable_field(locator) }
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
-  describe { |options| " that is disabled" if options[:disabled] }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] == true }
 end
 
 Capybara.add_selector(:radio_button) do
@@ -179,13 +201,13 @@ Capybara.add_selector(:radio_button) do
   filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:option)  { |node, value|  node.value == value.to_s }
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
   describe do |options|
     desc, states = "", []
     desc << " with value #{options[:option].inspect}" if options[:option]
     states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
     states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
-    states << 'disabled' if options[:disabled]
+    states << 'disabled' if options[:disabled] == true
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc
   end
@@ -196,13 +218,13 @@ Capybara.add_selector(:checkbox) do
   filter(:checked, boolean: true) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked, boolean: true) { |node, value| (value ^ node.checked?) }
   filter(:option)  { |node, value|  node.value == value.to_s }
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
   describe do |options|
     desc, states = "", []
     desc << " with value #{options[:option].inspect}" if options[:option]
     states << 'checked' if options[:checked] || (options.has_key?(:unchecked) && !options[:unchecked])
     states << 'not checked' if options[:unchecked] || (options.has_key?(:checked) && !options[:checked])
-    states << 'disabled' if options[:disabled]
+    states << 'disabled' if options[:disabled] == true
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc
   end
@@ -212,21 +234,31 @@ Capybara.add_selector(:select) do
   label "select box"
   xpath { |locator| XPath::HTML.select(locator) }
   filter(:options) do |node, options|
-    actual = node.all(:xpath, './/option').map { |option| option.text }
+    if node.visible?
+      actual = node.all(:xpath, './/option').map { |option| option.text }
+    else
+      actual = node.all(:xpath, './/option', visible: false).map { |option| option.text(:all) }
+    end
     options.sort == actual.sort
   end
-  filter(:with_options) { |node, options| options.all? { |option| node.first(:option, option, minimum: 0) } }
+  filter(:with_options) do |node, options|
+    finder_settings = { minimum: 0 }
+    if !node.visible?
+      finder_settings[:visible] = false
+    end
+    options.all? { |option| node.first(:option, option, finder_settings) }
+  end
   filter(:selected) do |node, selected|
-    actual = node.all(:xpath, './/option').select { |option| option.selected? }.map { |option| option.text }
+    actual = node.all(:xpath, './/option', visible: false).select { |option| option.selected? }.map { |option| option.text(:all) }
     [selected].flatten.sort == actual.sort
   end
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
   describe do |options|
     desc = ""
     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 << " that is disabled" if options[:disabled]
+    desc << " that is disabled" if options[:disabled] == true
     desc
   end
 end
@@ -238,8 +270,8 @@ end
 Capybara.add_selector(:file_field) do
   label "file field"
   xpath { |locator| XPath::HTML.file_field(locator) }
-  filter(:disabled, default: false, boolean: true) { |node, value| not(value ^ node.disabled?) }
-  describe { |options| " that is disabled" if options[:disabled] }
+  filter(:disabled, default: false, boolean: true, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
+  describe { |options| " that is disabled" if options[:disabled] == true}
 end
 
 Capybara.add_selector(:table) do