capybara 2.0.1 → 2.0.2

data/History.md

@@ -1,14 +1,37 @@
-# master
+# Version 2.0.2
+
+Release date: 2012-12-31
+
+### Changed
+
+* Capybara no longer uses thin as a server if it is available, due to thread
+  safety issues. Now Capybara always defaults to WEBrick. [Jonas Nicklas]
+
+### Fixed
+
+* Suppress several warnings [Kouhei Sutou]
+* Fix default host becoming nil [Brian Cardarella]
+* Fix regression in 2.0.1 which caused node comparisons with non node objects
+  to throw an exception [Kouhei Sotou]
+* A few changes to the specs, only relevant to driver authors [Jonas Nicklas]
+* Encoding error under JRuby [Piotr Krawiec]
+* Ruby 2 encoding fix [Murahashi Sanemat Kenichi]
+* Catch correct exception on server timeout [Jonathan del Strother]
+
+# Version 2.0.1
+
+Release date: 2012-12-21
 
 ### Changed
 
 * Move the RackTest driver override with the `:respect_data_method` option
   enabled from capybara/rspec to capybara/rails, so that it is enabled in
   Rails projects that don't use RSpec. [Carlos Antonio da Silva]
-* Source is now an alias for `body`. RackTest no longer returns modifications
-  to `body`. This basically codifies the behaviour which we've had for a while
-  anyway, and should have minimal impact for end users. It is important to
-  driver authors though. [Jonas Nicklas]
+* `source` is now an alias for `html`. RackTest no longer returns modifications
+  to `html`. This basically codifies the behaviour which we've had for a while
+  anyway, and should have minimal impact for end users. For driver authors, it
+  means that they only have to implement `html`, and not `source`. [Jonas
+  Nicklas]
 
 ### Fixed
 
@@ -131,6 +154,14 @@ Release date: 2012-11-05
 * `:count => 0` now works as expected [Jarl Friis]
 * Fixed race conditions on negative assertions when removing nodes [Jonas Nicklas]
 
+# Version 1.1.4
+
+Release date: 2012-11-28
+
+### Fixed
+
+* Fix more race conditions on negative assertions. [Jonas Nicklas]
+
 # Version 1.1.3
 
 Release date: 2012-10-30

data/README.md

@@ -827,7 +827,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/jtrupiano/timecop).
+  One such gem is [Timecop](http://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

@@ -12,9 +12,7 @@ module Capybara
   class FileNotFound < CapybaraError; end
   class UnselectNotAllowed < CapybaraError; end
   class NotSupportedByDriverError < CapybaraError; end
-  class TimeoutError < CapybaraError; end
-  class LocateHiddenElementError < CapybaraError; end
-  class InfiniteRedirectError < TimeoutError; end
+  class InfiniteRedirectError < CapybaraError; end
 
   class << self
     attr_accessor :asset_root, :app_host, :run_server, :default_host, :always_include_port
@@ -175,14 +173,8 @@ module Capybara
     # @param [Fixnum] port              The port to run the application on
     #
     def run_default_server(app, port)
-      begin
-        require 'rack/handler/thin'
-        Thin::Logging.silent = true
-        Rack::Handler::Thin.run(app, :Port => port)
-      rescue LoadError
-        require 'rack/handler/webrick'
-        Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
-      end
+      require 'rack/handler/webrick'
+      Rack::Handler::WEBrick.run(app, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
     end
 
     ##

data/lib/capybara/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Capybara
   module Helpers
     class << self

data/lib/capybara/node/base.rb

@@ -31,6 +31,7 @@ module Capybara
       def initialize(session, base)
         @session = session
         @base = base
+        @unsynchronized = false
       end
 
       # overridden in subclasses, e.g. Capybara::Node::Element

data/lib/capybara/node/matchers.rb

@@ -421,15 +421,9 @@ module Capybara
       ##
       #
       # Checks if the page or current node has a table with the given id
-      # or caption.
+      # or caption:
       #
-      # If the options :rows is given, it will check that the table contains
-      # the rows and columns given:
-      #
-      #    page.has_table?('People', :rows => [['Jonas', '24'], ['Peter', '32']])
-      #
-      # Note that this option is quite strict, the order needs to be correct
-      # and the text needs to match exactly.
+      #    page.has_table?('People')
       #
       # @param [String] locator                        The id or caption of a table
       # @return [Boolean]                              Whether it exist
@@ -451,7 +445,7 @@ module Capybara
       end
 
       def ==(other)
-        self.eql?(other) or base == other.base
+        self.eql?(other) or (other.respond_to?(:base) and base == other.base)
       end
 
     private

data/lib/capybara/rack_test/browser.rb

@@ -94,7 +94,7 @@ protected
 
   def build_rack_mock_session
     reset_host! unless current_host
-    Rack::MockSession.new(app, URI.parse(current_host).host)
+    Rack::MockSession.new(app, current_host)
   end
 
   def request_path

data/lib/capybara/selector.rb

@@ -21,6 +21,7 @@ module Capybara
       @name = name
       @custom_filters = {}
       @match = nil
+      @label = nil
       @failure_message = nil
       instance_eval(&block)
     end

data/lib/capybara/server.rb

@@ -76,7 +76,7 @@ module Capybara
 
         Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
       end
-    rescue TimeoutError
+    rescue Timeout::Error
       raise "Rack application timed out during boot"
     else
       self

data/lib/capybara/session.rb

@@ -51,7 +51,10 @@ module Capybara
       @app = app
       if Capybara.run_server and @app and driver.needs_server?
         @server = Capybara::Server.new(@app).boot
+      else
+        @server = nil
       end
+      @touched = false
     end
 
     def driver

data/lib/capybara/spec/session/current_url_spec.rb

@@ -79,15 +79,15 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
     should_be_on 0, "/landed"
   end
 
-   it "is affected by pushState", :requires => [:js] do
-     @session.visit("/with_js")
-     @session.execute_script("window.history.pushState({}, '', '/pushed')")
-     @session.current_path.should == "/pushed"
-   end
+  it "is affected by pushState", :requires => [:js] do
+    @session.visit("/with_js")
+    @session.execute_script("window.history.pushState({}, '', '/pushed')")
+    @session.current_path.should == "/pushed"
+  end
 
-   it "is affected by replaceState", :requires => [:js] do
-     @session.visit("/with_js")
-     @session.execute_script("window.history.replaceState({}, '', '/replaced')")
-     @session.current_path.should == "/replaced"
-   end
+  it "is affected by replaceState", :requires => [:js] do
+    @session.visit("/with_js")
+    @session.execute_script("window.history.replaceState({}, '', '/replaced')")
+    @session.current_path.should == "/replaced"
+  end
 end

data/lib/capybara/spec/session/node_spec.rb

@@ -114,6 +114,10 @@ Capybara::SpecHelper.spec "node" do
       (@session.find('//h1') === @session.find('//h1')).should be_true
       (@session.find('//h1').eql? @session.find('//h1')).should be_false
     end
+
+    it "returns false for unrelated object" do
+      (@session.find('//h1') == "Not Capybara::Node::Base").should be_false
+    end
   end
 
   describe "#trigger", :requires => [:js, :trigger] do

data/lib/capybara/spec/session/screenshot.rb

@@ -1,3 +1,4 @@
+#coding: US-ASCII
 Capybara::SpecHelper.spec "#save_screenshot" do
   let(:image_path) { File.join(Dir.tmpdir, 'capybara-screenshot.png') }
 

data/lib/capybara/spec/spec_helper.rb

@@ -9,24 +9,25 @@ module Capybara
   module SpecHelper
     class << self
       def configure(config)
-        filter = lambda do |requires, metadata|
-          if requires and metadata[:skip]
-            requires.any? do |require|
-              metadata[:skip].include?(require)
-            end
-          else
-            false
-          end
-        end
-        config.filter_run_excluding :requires => filter
-        config.before do
-          Capybara.app = TestApp
+        config.filter_run_excluding :requires => method(:filter).to_proc
+        config.before { Capybara::SpecHelper.reset! }
+        config.after { Capybara::SpecHelper.reset! }
+      end
 
-          Capybara.configure do |config|
-            config.default_selector = :xpath
-          end
+      def reset!
+        Capybara.app = TestApp
+        Capybara.app_host = nil
+        Capybara.default_selector = :xpath
+        Capybara.default_wait_time = 1
+      end
 
-          Capybara.default_wait_time = 1
+      def filter(requires, metadata)
+        if requires and metadata[:skip]
+          requires.any? do |require|
+            metadata[:skip].include?(require)
+          end
+        else
+          false
         end
       end
 
@@ -45,8 +46,8 @@ module Capybara
           after do
             @session.reset_session!
           end
-          specs.each do |name, options, block|
-            describe name, options do
+          specs.each do |spec_name, spec_options, block|
+            describe spec_name, spec_options do
               class_eval(&block)
             end
           end
@@ -77,8 +78,4 @@ module Capybara
   end
 end
 
-RSpec.configure do |config|
-  Capybara::SpecHelper.configure(config)
-end
-
 Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/spec/dsl_spec.rb

@@ -229,41 +229,25 @@ describe Capybara::DSL do
     end
 
     it "should be possible to include it in another class" do
-      klass = Class.new do
-        include Capybara::DSL
-      end
-      foo = klass.new
-      foo.visit('/with_html')
-      foo.click_link('ullamco')
-      foo.body.should include('Another World')
+      @session.visit('/with_html')
+      @session.click_link('ullamco')
+      @session.body.should include('Another World')
     end
 
     it "should provide a 'page' shortcut for more expressive tests" do
-      klass = Class.new do
-        include Capybara::DSL
-      end
-      foo = klass.new
-      foo.page.visit('/with_html')
-      foo.page.click_link('ullamco')
-      foo.page.body.should include('Another World')
+      @session.page.visit('/with_html')
+      @session.page.click_link('ullamco')
+      @session.page.body.should include('Another World')
     end
 
     it "should provide an 'using_session' shortcut" do
-      klass = Class.new do
-        include Capybara::DSL
-      end
       Capybara.should_receive(:using_session).with(:name)
-      foo = klass.new
-      foo.using_session(:name)
+      @session.using_session(:name)
     end
 
     it "should provide a 'using_wait_time' shortcut" do
-      klass = Class.new do
-        include Capybara::DSL
-      end
       Capybara.should_receive(:using_wait_time).with(6)
-      foo = klass.new
-      foo.using_wait_time(6)
+      @session.using_wait_time(6)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,5 @@
 require 'capybara/spec/spec_helper'
+
+RSpec.configure do |config|
+  Capybara::SpecHelper.configure(config)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri