capybara 2.1.0 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ff8b1c7b127254ed4d7b263f6059404d55f7d2c5
+  data.tar.gz: 56a9f3f7468241935f824fbcc6fb531bcc79c9ac
+SHA512:
+  metadata.gz: 19aaa439fe5623157eddd25d709dc929d5271adc1e3d5e6f34880cb33e9b51185d4fca4594c2693ad49c4b3cfe400cf47d75098032b7b2539ffe93c322bad2d0
+  data.tar.gz: e6a3cf29a04aed9ca5a407d25d02fc1ede00550008e646379aff6018037f82029f697a979d0dfdfac6613f66fc912590272b9d1717994a7c9bb3528893d2b648

data/History.md

@@ -1,6 +1,53 @@
+# Version 2.2.0
+
+Release date: 2013-11-21
+
+### Added
+
+* Add `go_back` and `go_forward` methods. [Vasiliy Ermolovich]
+* Support RSpec 3 [Thomas Holmes]
+* `has_button?`, `has_checked_field?` and `has_unchecked_field?` accept
+  options, like other matchers. [Carol Nichols]
+* The `assert_selector` and `has_text?` methods now support the `:wait` option
+  [Vasiliy Ermolovich]
+* RackTest's visible? method now checks for the HTML5 `hidden` attribute.
+* Results from `#all` now delegate the `sample` method. [Phil Lee]
+* The `set` method now works for contenteditable attributes under Selenium.
+  [Jon Rowe]
+* radio buttons and check boxes can be filtered by option value, useful when
+  selecting by name [Jonas Nicklas]
+* feature blocks can be nested within other feature blocks in RSpec tests
+  [Travis Gaff]
+
+### Fixed
+
+* Fixed race conditions causing stale element errors when filtering by text.
+  [Jonas Nicklas]
+* Resetting the page is now synchronous and navigates to an empty HTML file,
+  instead of `about:blank`, fixing hanging issues in JRuby. [Jonas Nicklas]
+* Fixed cookies not being set when path is blank under RackTest [Thomas Walpole]
+* Clearing fields now correctly causes change events [Jonas Nicklas]
+* Navigating to an absolut URI without trailing slash now works as expected
+  under RackTest [Jonas Nicklas]
+* Checkboxes without assigned value default to `on` under RackTest [Nigel Sheridan-Smith]
+* Clicks on buttons with no form associated with them are ignored in RackTest
+  instead of raising an obscure exception. [Thomas Walpole]
+* execute_script is now a session method [Andrey Botalov]
+* Nesting `within_window` and `within_frame` inside `within` resets the scope
+  so that they behave like a user would expect [Thomas Walpole]
+* Improve handling of newlines in textareas [Thomas Walpole]
+* `Capybara::Result` delegates its inspect method, so as not to confuse users
+  [Sam Rawlins]
+* save_page always returns a full path, fixes problems with Launchy [Jonas Nicklas]
+* Selenium driver's `quit` method does nothing when browser hasn't been loaded
+  [randoum]
+* Capybara's WEBRick server now propertly respects the server_host option
+  [Dmitry Vorotilin]
+* gemspec now includes license information [Jonas Nicklas]
+
 # Version 2.1.0
 
-Release date: Unreleased
+Release date: 2013-04-09
 
 ### Changed
 

data/README.md

@@ -2,7 +2,7 @@
 
 [![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 Quality](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jnicklas/capybara)
+[![Code Climate](https://codeclimate.com/github/jnicklas/capybara.png)](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
@@ -96,7 +96,7 @@ Capybara with `:type => :feature`.
 You can now write your specs like so:
 
 ```ruby
-describe "the signup process", :type => :feature do
+describe "the signin process", :type => :feature do
   before :each do
     User.make(:email => 'user@example.com', :password => 'caplin')
   end
@@ -108,7 +108,7 @@ describe "the signup process", :type => :feature do
       fill_in 'Password', :with => 'password'
     end
     click_link 'Sign in'
-    page.should have_content 'Success'
+    expect(page).to have_content 'Success'
   end
 end
 ```
@@ -127,7 +127,7 @@ end
 Finally, Capybara also comes with a built in DSL for creating descriptive acceptance tests:
 
 ```ruby
-feature "Signing up" do
+feature "Signing in" do
   background do
     User.make(:email => 'user@example.com', :password => 'caplin')
   end
@@ -139,7 +139,7 @@ feature "Signing up" do
       fill_in 'Password', :with => 'caplin'
     end
     click_link 'Sign in'
-    page.should have_content 'Success'
+    expect(page).to have_content 'Success'
   end
 
   given(:other_user) { User.make(:email => 'other@example.com', :password => 'rous') }
@@ -151,7 +151,7 @@ feature "Signing up" do
       fill_in 'Password', :with => other_user.password
     end
     click_link 'Sign in'
-    page.should have_content 'Invalid email or password'
+    expect(page).to have_content 'Invalid email or password'
   end
 end
 ```
@@ -162,7 +162,7 @@ end
 
 ## Using Capybara with Test::Unit
 
-* If you are using Rails, add the following code in your `test_helper.rb` 
+* 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
     `ActionDispatch::IntegrationTest`:
 
@@ -209,7 +209,7 @@ end
 Set up your base class as with Test::Unit. (On Rails, the right base class
 could be something other than ActionDispatch::IntegrationTest.)
 
-The capybara_minitest_spec gem ([Github](https://github.com/ordinaryzelig/capybara_minitest_spec),
+The capybara_minitest_spec gem ([GitHub](https://github.com/ordinaryzelig/capybara_minitest_spec),
 [rubygems.org](https://rubygems.org/gems/capybara_minitest_spec)) provides MiniTest::Spec
 expectations for Capybara. For example:
 
@@ -271,7 +271,7 @@ RackTest can be configured with a set of headers like this:
 
 ```ruby
 Capybara.register_driver :rack_test do |app|
-  Capybara::RackTest::Driver.new(app, :browser => :chrome)
+  Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_USER_AGENT' => 'Capybara' })
 end
 ```
 
@@ -281,10 +281,12 @@ See the section on adding and configuring drivers.
 
 At the moment, Capybara supports [Selenium 2.0
 (Webdriver)](http://seleniumhq.org/docs/01_introducing_selenium.html#selenium-2-aka-selenium-webdriver),
-*not* Selenium RC. Provided Firefox is installed, everything is set up for you,
-and you should be able to start using Selenium right away.
+*not* Selenium RC. In order to use Selenium, you'll need to install the
+`selenium-webdriver` gem, and add it to your Gemfile if you're using bundler.
+Provided Firefox is installed, everything is set up for you, and you should be
+able to start using Selenium right away.
 
-**Note**: drivers which run the server in a different thread may not work share the
+**Note**: drivers which run the server in a different thread may not share the
 same transaction as your tests, causing data not to be shared between your test
 and test server, see "Transactions and database setup" below.
 
@@ -325,7 +327,7 @@ Capybara heavily uses XPath, which doesn't support case insensitivity.
 ### Navigating
 
 You can use the
-[#visit](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Session#visit-instance_method)
+<tt>[visit](http://rubydoc.info/github/jnicklas/capybara/master/Capybara/Session#visit-instance_method)</tt>
 method to navigate to other pages:
 
 ```ruby
@@ -450,8 +452,6 @@ within(:xpath, "//li[@id='employee']") do
 end
 ```
 
-**Note**: `within` will scope the actions to the _first_ (not _any_) element that matches the selector.
-
 There are special methods for restricting the scope to a specific fieldset,
 identified by either an id or the text of the fieldset's legend tag, and to a
 specific table, identified by either id or text of the table's caption tag.
@@ -794,7 +794,7 @@ end
 
 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
-drivers. This is how to switch the selenium driver to use chrome:
+drivers. This is how to override the selenium driver configuration to use chrome:
 
 ```ruby
 Capybara.register_driver :selenium do |app|
@@ -802,8 +802,7 @@ Capybara.register_driver :selenium do |app|
 end
 ```
 
-However, it's also possible to give this a different name, so tests can switch
-between using different browsers effortlessly:
+However, it's also possible to give this configuration a different name.
 
 ```ruby
 Capybara.register_driver :selenium_chrome do |app|
@@ -811,6 +810,11 @@ Capybara.register_driver :selenium_chrome do |app|
 end
 ```
 
+Then tests can switch between using different browsers effortlessly:
+```ruby
+Capybara.current_driver = :selenium_chrome
+```
+
 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.

data/lib/capybara/cucumber.rb

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

data/lib/capybara/driver/base.rb

@@ -10,7 +10,7 @@ class Capybara::Driver::Base
   def find_xpath(query)
     raise NotImplementedError
   end
-  
+
   def find_css(query)
     raise NotImplementedError
   end
@@ -19,6 +19,14 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
+  def go_back
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#go_back'
+  end
+
+  def go_forward
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#go_forward'
+  end
+
   def execute_script(script)
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#execute_script'
   end

data/lib/capybara/empty.html

@@ -0,0 +1,4 @@
+<!doctype>
+<html>
+  <!-- an empty HTML document, used for resetting the page content -->
+</html>

data/lib/capybara/node/actions.rb

@@ -19,7 +19,7 @@ module Capybara
       # Finds a link by id or text and clicks it. Also looks at image
       # alt text inside the link.
       #
-      # @param [String] locator      Text, id or text of link
+      # @param [String] locator      Text or id of link
       # @param options
       # @option options [String] :href    The value the href attribute must be
       #

data/lib/capybara/node/finders.rb

@@ -147,16 +147,16 @@ module Capybara
     private
 
       def resolve_query(query, exact=nil)
-        elements = synchronize do
-          if query.selector.format==:css
+        synchronize do
+          elements = if query.selector.format==:css
             base.find_css(query.css)
           else
             base.find_xpath(query.xpath(exact))
           end.map do |node|
             Capybara::Node::Element.new(session, node, self, query)
           end
+          Capybara::Result.new(elements, query)
         end
-        Capybara::Result.new(elements, query)
       end
     end
   end

data/lib/capybara/node/matchers.rb

@@ -85,7 +85,8 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not exist
       #
       def assert_selector(*args)
-        synchronize do
+        query = Capybara::Query.new(*args)
+        synchronize(query.wait) do
           result = all(*args)
           result.matches_count? or raise Capybara::ExpectationNotMet, result.failure_message
         end
@@ -101,7 +102,8 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector exists
       #
       def assert_no_selector(*args)
-        synchronize do
+        query = Capybara::Query.new(*args)
+        synchronize(query.wait) do
           result = all(*args)
           result.matches_count? and raise Capybara::ExpectationNotMet, result.negative_failure_message
         end
@@ -215,7 +217,8 @@ module Capybara
       #   @return [Boolean]                          Whether it exists
       #
       def has_text?(*args)
-        synchronize do
+        query = Capybara::Query.new(*args)
+        synchronize(query.wait) do
           raise ExpectationNotMet unless text_found?(*args)
         end
         return true
@@ -233,7 +236,8 @@ module Capybara
       # @return [Boolean]  Whether it doesn't exist
       #
       def has_no_text?(*args)
-        synchronize do
+        query = Capybara::Query.new(*args)
+        synchronize(query.wait) do
           raise ExpectationNotMet if text_found?(*args)
         end
         return true
@@ -276,8 +280,8 @@ module Capybara
       # @param [String] locator      The text, value or id of a button to check for
       # @return [Boolean]            Whether it exists
       #
-      def has_button?(locator)
-        has_selector?(:button, locator)
+      def has_button?(locator, options={})
+        has_selector?(:button, locator, options)
       end
 
       ##
@@ -288,8 +292,8 @@ module Capybara
       # @param [String] locator      The text, value or id of a button to check for
       # @return [Boolean]            Whether it doesn't exist
       #
-      def has_no_button?(locator)
-        has_no_selector?(:button, locator)
+      def has_no_button?(locator, options={})
+        has_no_selector?(:button, locator, options)
       end
 
       ##
@@ -341,8 +345,8 @@ module Capybara
       # @param [String] locator           The label, name or id of a checked field
       # @return [Boolean]                 Whether it exists
       #
-      def has_checked_field?(locator)
-        has_selector?(:field, locator, :checked => true)
+      def has_checked_field?(locator, options={})
+        has_selector?(:field, locator, options.merge(:checked => true))
       end
 
       ##
@@ -352,10 +356,10 @@ module Capybara
       # checked.
       #
       # @param [String] locator           The label, name or id of a checked field
-      # @return [Boolean]                 Whether it doesn't exists
+      # @return [Boolean]                 Whether it doesn't exist
       #
-      def has_no_checked_field?(locator)
-        has_no_selector?(:field, locator, :checked => true)
+      def has_no_checked_field?(locator, options={})
+        has_no_selector?(:field, locator, options.merge(:checked => true))
       end
 
       ##
@@ -367,8 +371,8 @@ module Capybara
       # @param [String] locator           The label, name or id of an unchecked field
       # @return [Boolean]                 Whether it exists
       #
-      def has_unchecked_field?(locator)
-        has_selector?(:field, locator, :unchecked => true)
+      def has_unchecked_field?(locator, options={})
+        has_selector?(:field, locator, options.merge(:unchecked => true))
       end
 
       ##
@@ -378,10 +382,10 @@ module Capybara
       # unchecked.
       #
       # @param [String] locator           The label, name or id of an unchecked field
-      # @return [Boolean]                 Whether it doesn't exists
+      # @return [Boolean]                 Whether it doesn't exist
       #
-      def has_no_unchecked_field?(locator)
-        has_no_selector?(:field, locator, :unchecked => true)
+      def has_no_unchecked_field?(locator, options={})
+        has_no_selector?(:field, locator, options.merge(:unchecked => true))
       end
 
       ##

data/lib/capybara/node/simple.rb

@@ -18,7 +18,7 @@ module Capybara
       attr_reader :native
 
       def initialize(native)
-        native = Nokogiri::HTML(native) if native.is_a?(String)
+        native = Capybara::HTML(native) if native.is_a?(String)
         @native = native
       end
 
@@ -74,7 +74,7 @@ module Capybara
       #
       def value
         if tag_name == 'textarea'
-          native.content.sub(/\A\n/, '')
+          native.content
         elsif tag_name == 'select'
           if native['multiple'] == 'multiple'
             native.xpath(".//option[@selected='selected']").map { |option| option[:value] || option.content  }
@@ -82,6 +82,8 @@ module Capybara
             option = native.xpath(".//option[@selected='selected']").first || native.xpath(".//option").first
             option[:value] || option.content if option
           end
+        elsif tag_name == 'input' && %w(radio checkbox).include?(native[:type])
+          native[:value] || 'on'
         else
           native[:value]
         end
@@ -95,7 +97,7 @@ module Capybara
       # @return [Boolean]     Whether the element is visible
       #
       def visible?
-        native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none') or name()='script' or name()='head']").size == 0
+        native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none') or @hidden or name()='script' or name()='head']").size == 0
       end
 
       ##

data/lib/capybara/query.rb

@@ -32,6 +32,7 @@ module Capybara
     def description
       @description = "#{label} #{locator.inspect}"
       @description << " with text #{options[:text].inspect}" if options[:text]
+      @description << " with value #{options[:with].inspect}" if options[:with]
       @description
     end
 

data/lib/capybara/rack_test/browser.rb

@@ -46,6 +46,7 @@ class Capybara::RackTest::Browser
     method.downcase! unless method.is_a? Symbol
 
     new_uri.path = request_path if path.start_with?("?")
+    new_uri.path = "/" if new_uri.path.empty?
     new_uri.path = request_path.sub(%r(/[^/]*$), '/') + new_uri.path unless new_uri.path.start_with?('/')
     new_uri.scheme ||= @current_scheme
     new_uri.host ||= @current_host
@@ -77,7 +78,7 @@ class Capybara::RackTest::Browser
   end
 
   def dom
-    @dom ||= Nokogiri::HTML(html)
+    @dom ||= Capybara::HTML(html)
   end
 
   def find(format, selector)
@@ -93,11 +94,11 @@ class Capybara::RackTest::Browser
   rescue Rack::Test::Error
     ""
   end
-  
+
   def title
     dom.xpath("//title").text
   end
-  
+
 protected
 
   def build_rack_mock_session
@@ -108,6 +109,6 @@ protected
   def request_path
     last_request.path
   rescue Rack::Test::Error
-    ""
+    "/"
   end
 end

data/lib/capybara/rack_test/form.rb

@@ -28,7 +28,10 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
       case field.name
       when 'input'
         if %w(radio checkbox).include? field['type']
-          merge_param!(params, field['name'].to_s, field['value'].to_s) if field['checked']
+          if field['checked']
+            node=Capybara::RackTest::Node.new(self.driver, field)
+            merge_param!(params, field['name'].to_s, node.value.to_s)
+          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)
@@ -60,7 +63,7 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
         end
       when 'textarea'
-        merge_param!(params, field['name'].to_s, field.text.to_s)
+        merge_param!(params, field['name'].to_s, field.text.to_s.gsub(/\n/, "\r\n"))
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]

data/lib/capybara/rack_test/node.rb

@@ -52,7 +52,8 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
       driver.follow(method, self[:href].to_s)
     elsif (tag_name == 'input' and %w(submit image).include?(type)) or
         ((tag_name == 'button') and type.nil? or type == "submit")
-      Capybara::RackTest::Form.new(driver, form).submit(self)
+      associated_form = form
+      Capybara::RackTest::Form.new(driver, associated_form).submit(self) if associated_form
     end
   end
 

data/lib/capybara/result.rb

@@ -29,7 +29,8 @@ module Capybara
       @query = query
     end
 
-    def_delegators :@result, :each, :[], :at, :size, :count, :length, :first, :last, :empty?
+    def_delegators :@result, :each, :[], :at, :size, :count, :length,
+                   :first, :last, :values_at, :empty?, :inspect, :sample, :index
 
     def matches_count?
       Capybara::Helpers.matches_count?(@result.size, @query.options)

data/lib/capybara/rspec/features.rb

@@ -7,11 +7,13 @@ module Capybara
         alias :xscenario :xit
         alias :given :let
         alias :given! :let!
+        alias :feature :describe
       end
     end
   end
 end
 
+
 def self.feature(*args, &block)
   options = if args.last.is_a?(Hash) then args.pop else {} end
   options[:capybara_feature] = true

data/lib/capybara/rspec/matchers.rb

@@ -126,20 +126,20 @@ module Capybara
       HaveSelector.new(:link, locator, options)
     end
 
-    def have_button(locator)
-      HaveSelector.new(:button, locator)
+    def have_button(locator, options={})
+      HaveSelector.new(:button, locator, options)
     end
 
     def have_field(locator, options={})
       HaveSelector.new(:field, locator, options)
     end
 
-    def have_checked_field(locator)
-      HaveSelector.new(:field, locator, :checked => true)
+    def have_checked_field(locator, options={})
+      HaveSelector.new(:field, locator, options.merge(:checked => true))
     end
 
-    def have_unchecked_field(locator)
-      HaveSelector.new(:field, locator, :unchecked => true)
+    def have_unchecked_field(locator, options={})
+      HaveSelector.new(:field, locator, options.merge(:unchecked => true))
     end
 
     def have_select(locator, options={})

data/lib/capybara/rspec.rb

@@ -7,6 +7,12 @@ require 'capybara/rspec/features'
 RSpec.configure do |config|
   config.include Capybara::DSL, :type => :feature
   config.include Capybara::RSpecMatchers, :type => :feature
+
+  # A work-around to support accessing the current example that works in both
+  # RSpec 2 and RSpec 3.
+  fetch_current_example = RSpec.respond_to?(:current_example) ?
+    proc { RSpec.current_example } : proc { |context| context.example }
+
   # The before and after blocks must run instantaneously, because Capybara
   # might not actually be used in all examples where it's included.
   config.after do
@@ -17,6 +23,7 @@ RSpec.configure do |config|
   end
   config.before do
     if self.class.include?(Capybara::DSL)
+      example = fetch_current_example.call(self)
       Capybara.current_driver = Capybara.javascript_driver if example.metadata[:js]
       Capybara.current_driver = example.metadata[:driver] if example.metadata[:driver]
     end

data/lib/capybara/selector.rb

@@ -103,7 +103,7 @@ Capybara.add_selector(:field) do
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
-  filter(:with) { |node, with| node.value == with }
+  filter(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
     if ['textarea', 'select'].include?(type)
       node.tag_name == type
@@ -146,6 +146,7 @@ Capybara.add_selector(:radio_button) do
   xpath { |locator| XPath::HTML.radio_button(locator) }
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:option)  { |node, value|  node.value == value.to_s }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 
@@ -153,6 +154,7 @@ Capybara.add_selector(:checkbox) do
   xpath { |locator| XPath::HTML.checkbox(locator) }
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:option)  { |node, value|  node.value == value.to_s }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 

data/lib/capybara/selenium/driver.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     :browser => :firefox
@@ -43,6 +45,14 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.navigate.to(path)
   end
 
+  def go_back
+    browser.navigate.back
+  end
+
+  def go_forward
+    browser.navigate.forward
+  end
+
   def html
     browser.page_source
   end
@@ -87,7 +97,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         # to about:blank, so we rescue this error and do nothing
         # instead.
       end
-      @browser.navigate.to('about:blank')
+      uri = URI(Capybara::EMPTY_HTML_FILE_PATH)
+      uri.scheme = "file"
+      @browser.navigate.to(uri.to_s)
     end
   end
 
@@ -137,7 +149,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def quit
-    @browser.quit
+    @browser.quit if @browser
   rescue Errno::ECONNREFUSED
     # Browser must have already gone
   end