capybara 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2017d799f06c188c4e2295da57f68898b39b2130
-  data.tar.gz: d888f69a4571d7f905cad39a94b45ba25700e306
+  metadata.gz: 13e267dd4eab833671b7653e9cec855306653102
+  data.tar.gz: 80707daeb161eac1ac1cabff4edef7c06823b707
 SHA512:
-  metadata.gz: e3f921aa7e1b91b0067f5aaba1ffd93e99d462d3dae69af0b2f0eff39a05f9c281fdeb1df463738a122cf91150f21f6ccd608d336622ea622edc3e5ef5fda723
-  data.tar.gz: bac4d2d336de32d9fc131d8c660569a6881cfa0bbf902e4647e26a3b52abfa31f25f81d83abe73a873c37dfc02581403c4cec9c48e411bdb0abedbc1a253cb9f
+  metadata.gz: 03a372cfdbdd251f39577df0b83bd8286af62cc4d02bdedd49d91594fb3c2de88babacf628366f49c3a8d10470203bccfe371e461f3789f8c7dae0be94d6eda2
+  data.tar.gz: 77db21ebef969917a1a8836d5d95e6a725f1fe6dc235fe0e795eeca25fd46b209f77487ddb5e38a523c80f7772ea6d17627ddabda78081e335e002847f8da53e

data/History.md

@@ -1,3 +1,28 @@
+# Version 2.7.0
+Release date: unreleased
+
+### Fixed
+* Element#visible?/checked?/disabled?/selected? Now return boolean
+  as expected when using the rack_test driver [Thomas Walpole]
+* The rack_test driver now considers \<input type="hidden"> elements as non-visible [Thomas Walpole]
+* A nil locator passed to the built-in html type selectors now behaves consistently, and finds elements of the expected types [Thomas Walpole]
+* Capybara::Server now searches for available ports on the same interface it binds to [Aaron Stone]
+* Selenium Driver handles system modals that appear when page is unloading [Thomas Walpole]
+* Warning output if unused parameters are passed to a selector query [Thomas Walpole]
+
+### Added
+* Capybara now waits for requests to Capybaras server to complete while restting the session [John Hawthorn, Thomas Walpole]
+* Capybara.reuse_server option to allow disabling of sharing server instance between sessions [Thomas Walpole]
+* :multiple filter added to relevant selectors [Thomas Walpole]
+* Provided server registrations for :webrick and :puma. Capybara.server = :puma for testing with Rails 5 [Thomas Walpole]
+* Deprecate passing a block to Capybara::server user Capybara::register_server instead [Thomas Walpole]
+* :option selector supports :selected and :disabled filters [Thomas Walpole]
+* Element#matches_selector? and associated matchers (match_selector, match_css, etc) for comparing an element to a selector [Thomas Walpole]
+* Deprecated Driver#browser_initialized? - Driver#reset! is required to be synchronous [Jonas Nicklas, Thomas Walpole]
+* Deprecated Capybara.save_and_open_page_path in favor of Capybara.save_path with slightly different behavior when using relative paths with
+  save_page/save_screenshot [Thomas Walpole]
+* :label selector [Thomas Walpole]
+
 #Version 2.6.2
 Relase date: 2016-01-27
 
@@ -14,44 +39,44 @@ Release date: 2016-01-27
 Relase date: 2016-01-17
 
 ### Fixed
-* Fixed path escaping issue with current_path matchers [Tom Walpole, Luke Rollans] (Issue #1611)
+* Fixed path escaping issue with current_path matchers [Thomas 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]
+* Test for nested modal API method support [Thomas Walpole]
 
 
 ### Added
-* Capybara.modify_selector [Tom Walpole]
+* Capybara.modify_selector [Thomas 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.default_max_wait_time [Tom Walpole]
+* Selenium driver supports a :clear option to #set to handle different strategies for clearing a field [Thomas Walpole]
+* Support the use of rack 2.0 with the rack_test driver [Travis Grathwell, Thomas Walpole]
+* Disabled option for default selectors now supports true, false, or :all [Jillian Rosile, Thomas Walpole]
+* Modal API methods now default wait time to Capybara.default_max_wait_time [Thomas Walpole]
 
 # Version 2.5.0
 Release date: 2015-08-25
 
 ### Fixed
-* Error message now raised correctly when invalid options passed to 'have_text'/'have_content' [Tom Walpole]
-* Rack-test driver correctly gets document title when elements on the page have nested title elements (SVG) [Tom Walpole]
+* Error message now raised correctly when invalid options passed to 'have_text'/'have_content' [Thomas Walpole]
+* Rack-test driver correctly gets document title when elements on the page have nested title elements (SVG) [Thomas Walpole]
 * 'save_page' no longer errors when using Capybara.asset_host if the page has no \<head> element [Travis Grathwell]
 * rack-test driver will ignore clicks on links with href starting with '#' or 'javascript:'
 
 ### Added
-* has_current_path? and associated asserts/matchers added [Tom Walpole]
+* has_current_path? and associated asserts/matchers added [Thomas Walpole]
 * 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]
+* 'using_session' is now nestable [Thomas Walpole]
+* 'switch_to_window' will now use waiting behavior for a matching window to appear [Thomas Walpole]
 * 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]
 * 'find_all' as an alias of 'all' due to collision with RSpec
 * Capybara.wait_on_first_by_default setting (default is false)
   If set to true 'first' will use Capybaras waiting behavior to wait for at least one element to appear by default
-* Capybara waiting behavior uses the monotonic clock if supported to ease restrictions on freezing time in tests [Dmitry Maksyoma, Tom Walpole]
-* Capybara.server_errors setting that allows to configure what type of errors will be raised from the server thread [Tom Walpole]
-* Node#send_keys to allow for sending keypresses directly to elements [Tom Walpole]
+* Capybara waiting behavior uses the monotonic clock if supported to ease restrictions on freezing time in tests [Dmitry Maksyoma, Thomas Walpole]
+* Capybara.server_errors setting that allows to configure what type of errors will be raised from the server thread [Thomas Walpole]
+* Node#send_keys to allow for sending keypresses directly to elements [Thomas Walpole]
 * 'formmethod' attribute support in RackTest driver [Emilia Andrzejewska]
 * Clear field using backspaces in Selenium driver by using `:fill_options => { :clear => :backspace }` [Joe Lencioni]
 

data/README.md

@@ -51,7 +51,7 @@ GitHub): http://groups.google.com/group/ruby-capybara
 - [Gotchas:](#gotchas)
 - [Development](#development)
 
-## Key benefits
+## <a name="key-benefits"></a>Key benefits
 
 - **No setup** necessary for Rails and Rack application. Works out of the box.
 - **Intuitive API** which mimics the language an actual user would use.
@@ -60,7 +60,7 @@ GitHub): http://groups.google.com/group/ruby-capybara
 - **Powerful synchronization** features mean you never have to manually wait
   for asynchronous processes to complete.
 
-## Setup
+## <a name="setup"></a>Setup
 
 Capybara requires Ruby 1.9.3 or later. To install, add this line to your
 `Gemfile` and run `bundle install`:
@@ -89,7 +89,7 @@ Capybara.app = MyRackApp
 If you need to test JavaScript, or if your app interacts with (or is located at)
 a remote URL, you'll need to [use a different driver](#drivers).
 
-## Using Capybara with Cucumber
+## <a name="using-capybara-with-cucumber"></a>Using Capybara with Cucumber
 
 The `cucumber-rails` gem comes with Capybara support built-in. If you
 are not using Rails, manually load the `capybara/cucumber` module:
@@ -124,7 +124,7 @@ Scenario: do something Ajaxy
 There are also explicit `@selenium` and `@rack_test`
 tags set up for you.
 
-## Using Capybara with RSpec
+## <a name="using-capybara-with-rspec"></a>Using Capybara with RSpec
 
 Load RSpec 2.x support by adding the following line (typically to your
 `spec_helper.rb` file):
@@ -135,7 +135,7 @@ require 'capybara/rspec'
 
 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))
+RSpec](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`.
 
@@ -223,7 +223,7 @@ RSpec.describe "todos/show.html.erb", type: :view do
 end
 ```
 
-## Using Capybara with Test::Unit
+## <a name="using-capybara-with-testunit"></a>Using Capybara with Test::Unit
 
 * If you are using Rails, add the following code in your `test_helper.rb`
     file to make Capybara available in all test cases deriving from
@@ -233,6 +233,13 @@ end
     class ActionDispatch::IntegrationTest
       # Make the Capybara DSL available in all integration tests
       include Capybara::DSL
+
+      # Reset sessions and driver between tests
+      # Use super wherever this method is redefined in your individual test classes
+      def teardown
+        Capybara.reset_sessions!
+        Capybara.use_default_driver
+      end
     end
     ```
 
@@ -267,7 +274,7 @@ class BlogTest < ActionDispatch::IntegrationTest
 end
 ```
 
-## Using Capybara with MiniTest::Spec
+## <a name="using-capybara-with-minitestspec"></a>Using Capybara with MiniTest::Spec
 
 Set up your base class as with Test::Unit. (On Rails, the right base class
 could be something other than ActionDispatch::IntegrationTest.)
@@ -280,11 +287,11 @@ expectations for Capybara. For example:
 page.must_have_content('Important!')
 ```
 
-## Drivers
+## <a name="drivers"></a>Drivers
 
 Capybara uses the same DSL to drive a variety of browser and headless drivers.
 
-### Selecting the Driver
+### <a name="selecting-the-driver"></a>Selecting the Driver
 
 By default, Capybara uses the `:rack_test` driver, which is fast but limited: it
 does not support JavaScript, nor is it able to access HTTP resources outside of
@@ -315,7 +322,7 @@ Capybara.use_default_driver       # switch back to default driver
 **Note**: switching the driver creates a new session, so you may not be able to
 switch in the middle of a test.
 
-### RackTest
+### <a name="racktest"></a>RackTest
 
 RackTest is Capybara's default driver. It is written in pure Ruby and does not
 have any support for executing JavaScript. Since the RackTest driver interacts
@@ -340,7 +347,7 @@ end
 
 See the section on adding and configuring drivers.
 
-### Selenium
+### <a name="selenium"></a>Selenium
 
 At the moment, Capybara supports [Selenium 2.0
 (Webdriver)](http://seleniumhq.org/docs/01_introducing_selenium.html#selenium-2-aka-selenium-webdriver),
@@ -353,7 +360,7 @@ able to start using Selenium right away.
 same transaction as your tests, causing data not to be shared between your test
 and test server, see "Transactions and database setup" below.
 
-### Capybara-webkit
+### <a name="capybara-webkit"></a>Capybara-webkit
 
 The [capybara-webkit driver](https://github.com/thoughtbot/capybara-webkit) is for true headless
 testing. It uses QtWebKit to start a rendering engine process. It can execute JavaScript as well.
@@ -371,7 +378,7 @@ And you can use it by:
 Capybara.javascript_driver = :webkit
 ```
 
-### Poltergeist
+### <a name="poltergeist"></a>Poltergeist
 
 [Poltergeist](https://github.com/teampoltergeist/poltergeist) is another
 headless driver which integrates Capybara with
@@ -379,7 +386,7 @@ headless driver which integrates Capybara with
 require Xvfb to run on your CI server. It will also detect and report
 any Javascript errors that happen within the page.
 
-## The DSL
+## <a name="the-dsl"></a>The DSL
 
 *A complete reference is available at
 [rubydoc.info](http://rubydoc.info/github/jnicklas/capybara/master)*.
@@ -390,7 +397,7 @@ any Javascript errors that happen within the page.
 **Note**: All searches in Capybara are *case sensitive*. This is because
 Capybara heavily uses XPath, which doesn't support case insensitivity.
 
-### Navigating
+### <a name="navigating"></a>Navigating
 
 You can use the
 <tt>[visit](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Session#visit-instance_method)</tt>
@@ -416,7 +423,7 @@ expect(page).to have_current_path(post_comments_path(post))
 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
+### <a name="clicking-links-and-buttons"></a>Clicking links and buttons
 
 *Full reference: [Capybara::Node::Actions](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Actions)*
 
@@ -431,7 +438,7 @@ click_on('Link Text') # clicks on either links or buttons
 click_on('Button Value')
 ```
 
-### Interacting with forms
+### <a name="interacting-with-forms"></a>Interacting with forms
 
 *Full reference: [Capybara::Node::Actions](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Actions)*
 
@@ -448,7 +455,7 @@ attach_file('Image', '/path/to/image.jpg')
 select('Option', :from => 'Select Box')
 ```
 
-### Querying
+### <a name="querying"></a>Querying
 
 *Full reference: [Capybara::Node::Matchers](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Matchers)*
 
@@ -478,7 +485,7 @@ expect(page).to have_css('table tr.foo')
 expect(page).to have_content('foo')
 ```
 
-### Finding
+### <a name="finding"></a>Finding
 
 _Full reference: [Capybara::Node::Finders](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Node/Finders)_
 
@@ -505,7 +512,7 @@ find('#navigation').click_link('Home')
 expect(find('#navigation')).to have_button('Sign out')
 ```
 
-### Scoping
+### <a name="scoping"></a>Scoping
 
 Capybara makes it possible to restrict certain actions, such as interacting with
 forms or clicking links and buttons, to within a specific area of the page. For
@@ -537,7 +544,7 @@ within_table('Employee') do
 end
 ```
 
-### Working with windows
+### <a name="working-with-windows"></a>Working with windows
 
 Capybara provides some methods to ease finding and switching windows:
 
@@ -552,7 +559,7 @@ within_window facebook_window do
 end
 ```
 
-### Scripting
+### <a name="scripting"></a>Scripting
 
 In drivers which support it, you can easily execute JavaScript:
 
@@ -567,7 +574,7 @@ that this may break with more complicated expressions:
 result = page.evaluate_script('4 + 4');
 ```
 
-### Modals
+### <a name="modals"></a>Modals
 
 In drivers which support it, you can accept, dismiss and respond to alerts, confirms and prompts.
 
@@ -605,7 +612,7 @@ end
 expect(message).to eq('Who is the chief architect of Linux?')
 ```
 
-### Debugging
+### <a name="debugging"></a>Debugging
 
 It can be useful to take a snapshot of the page as it currently is and take a
 look at it:
@@ -636,12 +643,12 @@ Or have it save and automatically open:
 save_and_open_screenshot
 ```
 
-## Matching
+## <a name="matching"></a>Matching
 
 It is possible to customize how Capybara finds elements. At your disposal
 are two options, `Capybara.exact` and `Capybara.match`.
 
-### Exactness
+### <a name="exactness"></a>Exactness
 
 `Capybara.exact` and the `exact` option work together with the `is` expression
 inside the XPath gem. When `exact` is true, all `is` expressions match exactly,
@@ -658,7 +665,7 @@ click_link("Password") # does not match "Password confirmation"
 click_link("Password", exact: false) # can be overridden
 ```
 
-### Strategy
+### <a name="strategy"></a>Strategy
 
 Using `Capybara.match` and the equivalent `match` option, you can control how
 Capybara behaves when multiple elements all match a query. There are currently
@@ -679,7 +686,7 @@ The default for `Capybara.match` is `:smart`. To emulate the behaviour in
 Capybara 2.0.x, set `Capybara.match` to `:one`. To emulate the behaviour in
 Capybara 1.x, set `Capybara.match` to `:prefer_exact`.
 
-## Transactions and database setup
+## <a name="transactions-and-database-setup"></a>Transactions and database setup
 
 Some Capybara drivers need to run against an actual HTTP server. Capybara takes
 care of this and starts one for you in the same process as your test, but on
@@ -695,7 +702,7 @@ 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/DatabaseCleaner/database_cleaner).
 
-## Asynchronous JavaScript (Ajax and friends)
+## <a name="asynchronous-javascript-ajax-and-friends"></a>Asynchronous JavaScript (Ajax and friends)
 
 When working with asynchronous JavaScript, you might come across situations
 where you are attempting to interact with an element which is not yet present
@@ -735,7 +742,7 @@ The former would immediately fail because the content has not yet been removed.
 Only the latter would wait for the asynchronous process to remove the content
 from the page.
 
-Capybara's Rspec matchers, however, are smart enough to handle either form.
+Capybara's RSpec matchers, however, are smart enough to handle either form.
 The two following statements are functionally equivalent:
 
 ```ruby
@@ -757,7 +764,7 @@ the text of the `h1` to "Something", and this happened, this test would
 pass. If you do not want this behaviour, you can set
 `Capybara.automatic_reload` to `false`.
 
-## Using the DSL elsewhere
+## <a name="using-the-dsl-elsewhere"></a>Using the DSL elsewhere
 
 You can mix the DSL into any context by including <tt>Capybara::DSL</tt>:
 
@@ -782,7 +789,7 @@ end
 
 This enables its use in unsupported testing frameworks, and for general-purpose scripting.
 
-## Calling remote servers
+## <a name="calling-remote-servers"></a>Calling remote servers
 
 Normally Capybara expects to be testing an in-process Rack application, but you
 can also use it to talk to a web server running anywhere on the internet, by
@@ -811,7 +818,7 @@ remote application:
 Capybara.run_server = false
 ```
 
-## Using the sessions manually
+## <a name="using-the-sessions-manually"></a>Using the sessions manually
 
 For ultimate control, you can instantiate and use a
 [Session](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Session)
@@ -828,7 +835,7 @@ end
 session.click_button 'Sign in'
 ```
 
-## XPath, CSS and selectors
+## <a name="xpath-css-and-selectors"></a>XPath, CSS and selectors
 
 Capybara does not try to guess what kind of selector you are going to give it,
 and will always use CSS by default.  If you want to use XPath, you'll need to
@@ -874,7 +881,7 @@ find(:row, 3)
 find(:flash_type, :notice)
 ```
 
-## Beware the XPath // trap
+## <a name="beware-the-xpath--trap"></a>Beware the XPath // trap
 
 In XPath the expression // means something very specific, and it might not be what
 you think. Contrary to common belief, // means "anywhere in the document" not "anywhere
@@ -902,7 +909,7 @@ within(:xpath, '//body') do
 end
 ```
 
-## Configuring and adding drivers
+## <a name="configuring-and-adding-drivers"></a>Configuring and adding drivers
 
 Capybara makes it convenient to switch between different drivers. It also exposes
 an API to tweak those drivers with whatever settings you want, or to add your own
@@ -934,7 +941,7 @@ Gems can use this API to add their own drivers to Capybara.
 The [Selenium wiki](https://github.com/SeleniumHQ/selenium/wiki/Ruby-Bindings) has
 additional info about how the underlying driver can be configured.
 
-## Gotchas:
+## <a name="gotchas"></a>Gotchas:
 
 * Access to session and request is not possible from the test, Access to
   response is limited. Some drivers allow access to response headers and HTTP
@@ -962,7 +969,7 @@ additional info about how the underlying driver can be configured.
   are testing for specific server errors and using multiple sessions make sure to test for the
   errors using the initial session (usually :default)
 
-## Development
+## <a name="development"></a>Development
 
 To set up a development environment, simply do:
 

data/lib/capybara.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'timeout'
 require 'nokogiri'
 require 'xpath'
@@ -22,8 +23,10 @@ module Capybara
     attr_accessor :asset_host, :app_host, :run_server, :default_host, :always_include_port
     attr_accessor :server_port, :exact, :match, :exact_options, :visible_text_only
     attr_accessor :default_selector, :default_max_wait_time, :ignore_hidden_elements
-    attr_accessor :save_and_open_page_path, :wait_on_first_by_default, :automatic_reload, :raise_server_errors, :server_errors
+    attr_accessor :save_path, :wait_on_first_by_default, :automatic_reload
+    attr_accessor :reuse_server, :raise_server_errors, :server_errors
     attr_writer :default_driver, :current_driver, :javascript_driver, :session_name, :server_host
+    attr_reader :save_and_open_page_path
     attr_accessor :app
 
     ##
@@ -47,8 +50,9 @@ module Capybara
     # [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)
+    # [save_path = String]  Where to put pages saved through save_(page|screenshot), save_and_open_(page|screenshot) (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)
+    # [reuse_server = Boolean]  Reuse the server thread between multiple sessions using the same app object (Default: true)
     # === DSL Options
     #
     # when using capybara/dsl, the following options are also available:
@@ -77,6 +81,26 @@ module Capybara
       drivers[name] = block
     end
 
+    ##
+    #
+    # Register a new server for Capybara.
+    #
+    #     Capybara.register_server :webrick do |app, port, host|
+    #       require 'rack/handler/webrick'
+    #       Rack::Handler::WEBrick.run(app, ...)
+    #     end
+    #
+    # @param [Symbol] name                    The name of the new driver
+    # @yield [app, port, host]                This block takes a rack app and a port and returns a rack server listening on that port
+    # @yieldparam [<Rack>] app                The rack application that this server will contain.
+    # @yieldparam port                        The port number the server should listen on
+    # @yieldparam host                        The host/ip to bind to
+    # @yieldreturn [Capybara::Driver::Base]   A Capybara driver instance
+    #
+    def register_server(name, &block)
+      servers[name.to_sym] = block
+    end
+
     ##
     #
     # Add a new selector to Capybara. Selectors can be used by various methods in Capybara
@@ -111,11 +135,11 @@ module Capybara
 
     ##
     #
-    # Modify a selector previously craeated by {Capybara.add_selector}.
+    # Modify a selector previously created 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
+    #     Capybara.modify_selector(:button) do
     #       xpath { |locator| XPath::HTML.button(locator).or(XPath::css('div.btn')[XPath::string.n.is(locator)]) }
     #     end
     #
@@ -130,27 +154,49 @@ module Capybara
       @drivers ||= {}
     end
 
+    def servers
+      @servers ||= {}
+    end
+
     ##
     #
     # Register a proc that Capybara will call to run the Rack application.
     #
-    #     Capybara.server do |app, port|
+    #     Capybara.server do |app, port, host|
     #       require 'rack/handler/mongrel'
     #       Rack::Handler::Mongrel.run(app, :Port => port)
     #     end
     #
     # By default, Capybara will try to run webrick.
     #
-    # @yield [app, port]                      This block receives a rack app and port and should run a Rack handler
+    # @yield [app, port, host]      This block receives a rack app, port, and host/ip and should run a Rack handler
     #
     def server(&block)
       if block_given?
+        warn "DEPRECATED: Passing a block to Capybara::server is deprecated, please use Capybara::register_server instead"
         @server = block
       else
         @server
       end
     end
 
+    ##
+    #
+    # Set the server to use.
+    #
+    #     Capybara.server = :webrick
+    #
+    # @param [Symbol] name     Name of the server type to use
+    # @see register_server
+    #
+    def server=(name)
+      @server = if name.respond_to? :call
+        name
+      else
+        servers[name.to_sym]
+      end
+    end
+
     ##
     #
     # Wraps the given string, which should contain an HTML document or fragment
@@ -197,8 +243,7 @@ module Capybara
     # @param [Fixnum] port              The port to run the application on
     #
     def run_default_server(app, port)
-      require 'rack/handler/webrick'
-      Rack::Handler::WEBrick.run(app, :Host => server_host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+      servers[:webrick].call(app, port, server_host)
     end
 
     ##
@@ -335,11 +380,22 @@ module Capybara
       self.default_max_wait_time = t
     end
 
+    def save_and_open_page_path=(path)
+      warn "DEPRECATED: #save_and_open_page_path is deprecated, please use #save_path instead. \n"\
+           "Note: Behavior is slightly different with relative paths - see documentation" unless path.nil?
+      @save_and_open_page_path = path
+    end
+
     def included(base)
       base.send(:include, Capybara::DSL)
       warn "`include Capybara` is deprecated. Please use `include Capybara::DSL` instead."
     end
 
+    def reuse_server=(bool)
+      warn "Capybara.reuse_server == false is a BETA feature and may change in a future version" unless bool
+      @reuse_server = bool
+    end
+
     def deprecate(method, alternate_method, once=false)
       @deprecation_notified ||= {}
       warn "DEPRECATED: ##{method} is deprecated, please use ##{alternate_method} instead" unless once and @deprecation_notified[method]
@@ -370,10 +426,12 @@ module Capybara
   require 'capybara/version'
 
   require 'capybara/queries/base_query'
-  require 'capybara/query'
+  require 'capybara/queries/selector_query'
   require 'capybara/queries/text_query'
   require 'capybara/queries/title_query'
   require 'capybara/queries/current_path_query'
+  require 'capybara/queries/match_query'
+  require 'capybara/query'
 
   require 'capybara/node/finders'
   require 'capybara/node/matchers'
@@ -397,10 +455,26 @@ module Capybara
   require 'capybara/selenium/driver'
 end
 
+Capybara.register_server :default do |app, port, host|
+  Capybara.run_default_server(app, port)
+end
+
+Capybara.register_server :webrick do |app, port, host|
+  require 'rack/handler/webrick'
+  Rack::Handler::WEBrick.run(app, :Host => host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+end
+
+Capybara.register_server :puma do |app, port, host|
+  require 'puma'
+  Puma::Server.new(app).tap do |s|
+    s.add_tcp_listener host, port
+  end.run.join
+end
+
 Capybara.configure do |config|
   config.always_include_port = false
   config.run_server = true
-  config.server {|app, port| Capybara.run_default_server(app, port)}
+  config.server = :default
   config.default_selector = :css
   config.default_max_wait_time = 2
   config.ignore_hidden_elements = true
@@ -412,6 +486,7 @@ Capybara.configure do |config|
   config.server_errors = [StandardError]
   config.visible_text_only = false
   config.wait_on_first_by_default = false
+  config.reuse_server = true
 end
 
 Capybara.register_driver :rack_test do |app|
@@ -421,3 +496,4 @@ end
 Capybara.register_driver :selenium do |app|
   Capybara::Selenium::Driver.new(app)
 end
+