capybara 2.1.0.beta1 → 2.1.0.rc1

data/History.md

@@ -64,12 +64,21 @@ Release date: Unreleased
 
 * Fixed race conditions when synchronizing across multiple nodes [Jonas Nicklas]
 * Fixed race conditions in deeply nested selectors [Jonas Nicklas]
-* Use posix character class for whitespace replace, solves various encoding
-  problems on Ruby 2.0.0 and JRuby. [Jonas Nicklas]
 * Fix issue with `within_frame`, where selecting multiple nested frames didn't
   work as intended. [Thomas Walpole]
 * RackTest no longer fills in readonly textareas. [Thomas Walpole]
 * Don't use autoload to load files, require them directly instead. [Jonas Nicklas]
+* Rescue weird exceptions when booting server [John Wilger]
+* Non strings are now properly cast when using the maxlength attribute [Jonas Nicklas]
+
+# Version 2.0.3
+
+Release date: 2013-03-26
+
+* Check against Rails version fixed to work with Rails' master branch now returning
+  a Gem::Version [Jonas Nicklas]
+* Use posix character class for whitespace replace, solves various encoding
+  problems on Ruby 2.0.0 and JRuby. [Ben Cates]
 
 # Version 2.0.2
 

data/README.md

@@ -23,19 +23,19 @@ GitHub): http://groups.google.com/group/ruby-capybara
 
 ## Setup
 
-To install, type
+Capybara requires Ruby 1.9.3 or later. To install, type:
 
 ```bash
 gem install capybara
 ```
 
-If you are using Rails, add this line to your test helper file:
+If the application that you are testing is a Rails app, add this line to your test helper file:
 
 ```ruby
 require 'capybara/rails'
 ```
 
-If you are not using Rails, set Capybara.app to your rack app:
+If the application that you are testing is a Rack app, but not Rails, set Capybara.app to your Rack app:
 
 ```ruby
 Capybara.app = MyRackApp
@@ -162,36 +162,14 @@ end
 
 ## Using Capybara with Test::Unit
 
-* If you are using Rails, add `database_cleaner` to your Gemfile:
-
-    ```ruby
-    group :test do
-      gem 'database_cleaner'
-    end
-    ```
-
-    Then add the following code in your `test_helper.rb` file to make
-    Capybara available in all test cases deriving from
+* 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`:
 
     ```ruby
-    # Transactional fixtures do not work with Selenium tests, because Capybara
-    # uses a separate server thread, which the transactions would be hidden
-    # from. We hence use DatabaseCleaner to truncate our test database.
-    DatabaseCleaner.strategy = :truncation
-
     class ActionDispatch::IntegrationTest
       # Make the Capybara DSL available in all integration tests
       include Capybara::DSL
-
-      # Stop ActiveRecord from wrapping tests in transactions
-      self.use_transactional_fixtures = false
-
-      teardown do
-        DatabaseCleaner.clean       # Truncate the database
-        Capybara.reset_sessions!    # Forget the (simulated) browser state
-        Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
-      end
     end
     ```
 
@@ -784,25 +762,6 @@ find(:row, 3)
 find(:flash_type, :notice)
 ```
 
-You can specify an optional match option which will automatically use the
-selector if it matches the argument:
-
-```ruby
-Capybara.add_selector(:id) do
-  xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
-  match { |value| value.is_a?(Symbol) }
-end
-```
-
-Now use it like this:
-
-```ruby
-find(:post_123)
-```
-
-This :id selector is already built into Capybara by default, so you don't
-need to add it yourself.
-
 ## Beware the XPath // trap
 
 In XPath the expression // means something very specific, and it might not be what
@@ -887,7 +846,6 @@ additional info about how the underlying driver can be configured.
 To set up a development environment, simply do:
 
 ```bash
-git submodule update --init
 bundle install
 bundle exec rake  # run the test suite
 ```

data/lib/capybara.rb

@@ -33,7 +33,6 @@ module Capybara
     #
     # === Configurable options
     #
-    # [asset_host = String]               The hostname for a server from which assets can be loaded, used by save_and_open_page
     # [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)

data/lib/capybara/helpers.rb

@@ -37,7 +37,7 @@ module Capybara
     # `Capybara.asset_host`.
     #
     # @param [String] html     HTML code to inject into
-    # @param [String]          The modified HTML code
+    # @return [String]         The modified HTML code
     #
     def inject_asset_host(html)
       if Capybara.asset_host

data/lib/capybara/node/actions.rb

@@ -44,8 +44,8 @@ module Capybara
       #
       #     page.fill_in 'Name', :with => 'Bob'
       #
-      # @param [String] locator           Which field to fill in
-      # @param [Hash{:with => String}]    The value to fill in
+      # @param [String] locator                 Which field to fill in
+      # @param [Hash{:with => String}] options  The value to fill in
       #
       def fill_in(locator, options={})
         raise "Must pass a hash containing 'with'" if not options.is_a?(Hash) or not options.has_key?(:with)
@@ -100,8 +100,8 @@ module Capybara
       #
       #     page.select 'March', :from => 'Month'
       #
-      # @param [String] value             Which option to select
-      # @param [Hash{:from => String}]    The id, name or label of the select box
+      # @param [String] value                   Which option to select
+      # @param [Hash{:from => String}] options  The id, name or label of the select box
       #
       def select(value, options={})
         if options.has_key?(:from)
@@ -120,8 +120,8 @@ module Capybara
       #
       #     page.unselect 'March', :from => 'Month'
       #
-      # @param [String] value             Which option to unselect
-      # @param [Hash{:from => String}]    The id, name or label of the select box
+      # @param [String] value                   Which option to unselect
+      # @param [Hash{:from => String}] options  The id, name or label of the select box
       #
       def unselect(value, options={})
         if options.has_key?(:from)

data/lib/capybara/node/element.rb

@@ -49,9 +49,8 @@ module Capybara
       # ignored. This behaviour can be overridden by passing `:all` to this
       # method.
       #
-      # @param [:all, :visible]    Whether to return only visible or all text
-      #
-      # @return [String]           The text of the element
+      # @param [:all, :visible] type  Whether to return only visible or all text
+      # @return [String]              The text of the element
       #
       def text(type=nil)
         type ||= :all unless Capybara.ignore_hidden_elements or Capybara.visible_text_only

data/lib/capybara/node/finders.rb

@@ -137,7 +137,7 @@ module Capybara
       # @overload first([kind], locator, options)
       #   @param [:css, :xpath] kind                 The type of selector
       #   @param [String] locator                    The selector
-      #   @param [Hash] options                      Additional options; see {all}
+      #   @param [Hash] options                      Additional options; see {#all}
       # @return [Capybara::Element]                  The found element or nil
       #
       def first(*args)

data/lib/capybara/node/matchers.rb

@@ -28,12 +28,12 @@ module Capybara
       #     page.has_selector?(:xpath, XPath.descendant(:p))
       #
       # @param (see Capybara::Node::Finders#all)
-      # @param options                             a customizable set of options
-      # @option options [Integer] :count (nil)     Number of times the text should occur
-      # @option options [Integer] :minimum (nil)   Minimum number of times the text should occur
-      # @option options [Integer] :maximum (nil)   Maximum number of times the text should occur
-      # @option options [Range]   :between (nil)   Range of times that should contain number of times text occurs
-      # @return [Boolean]                          If the expression exists
+      # @param args
+      # @option args [Integer] :count (nil)     Number of times the text should occur
+      # @option args [Integer] :minimum (nil)   Minimum number of times the text should occur
+      # @option args [Integer] :maximum (nil)   Maximum number of times the text should occur
+      # @option args [Range]   :between (nil)   Range of times that should contain number of times text occurs
+      # @return [Boolean]                       If the expression exists
       #
       def has_selector?(*args)
         assert_selector(*args)

data/lib/capybara/node/simple.rb

@@ -36,8 +36,8 @@ module Capybara
       #
       #     element[:title] # => HTML title attribute
       #
-      # @param  [Symbol] attribute     The attribute to retrieve
-      # @return [String]               The value of the attribute
+      # @param  [Symbol] name  The attribute name to retrieve
+      # @return [String]       The value of the attribute
       #
       def [](name)
         attr_name = name.to_s

data/lib/capybara/query.rb

@@ -37,7 +37,7 @@ module Capybara
 
     def matches_filters?(node)
       if options[:text]
-        regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text])
+        regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
         return false if not node.text(visible).match(regexp)
       end
       case visible

data/lib/capybara/rack_test/node.rb

@@ -79,7 +79,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
       string_node.disabled?
     end
   end
-  
+
   def path
     native.path
   end
@@ -87,11 +87,11 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   def find_xpath(locator)
     native.xpath(locator).map { |n| self.class.new(driver, n) }
   end
-  
-  def find_css(locator)    
+
+  def find_css(locator)
     native.css(locator, Capybara::RackTest::CSSHandlers.new).map { |n| self.class.new(driver, n) }
   end
-  
+
   def ==(other)
     native == other.native
   end
@@ -153,7 +153,7 @@ private
     if text_or_password? && attribute_is_not_blank?(:maxlength)
       # Browser behavior for maxlength="0" is inconsistent, so we stick with
       # Firefox, allowing no input
-      value = value[0...self[:maxlength].to_i]
+      value = value.to_s[0...self[:maxlength].to_i]
     end
     if Array === value #Assert multiple attribute is present
       value.each do |v|

data/lib/capybara/rails.rb

@@ -3,7 +3,7 @@ require 'capybara/dsl'
 
 Capybara.app = Rack::Builder.new do
   map "/" do
-    if Rails.version.to_f >= 3.0
+    if Gem::Version.new(Rails.version) >= Gem::Version.new("3.0")
       run Rails.application
     else # Rails 2
       use Rails::Rack::Static

data/lib/capybara/selenium/driver.rb

@@ -1,14 +1,3 @@
-begin
-  require 'selenium-webdriver'
-rescue LoadError => e
-  if e.message =~ /selenium-webdriver/
-    raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
-  else
-    raise e
-  end
-end
-
-
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     :browser => :firefox
@@ -33,6 +22,16 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def initialize(app, options={})
+    begin
+      require 'selenium-webdriver'
+    rescue LoadError => e
+      if e.message =~ /selenium-webdriver/
+        raise LoadError, "Capybara's selenium driver is unable to load `selenium-webdriver`, please install the gem and add `gem 'selenium-webdriver'` to your Gemfile if you are using bundler."
+      else
+        raise e
+      end
+    end
+
     @app = app
     @browser = nil
     @exit_status = nil

data/lib/capybara/server.rb

@@ -62,7 +62,7 @@ module Capybara
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
         return res.body == @app.object_id.to_s
       end
-    rescue Errno::ECONNREFUSED, Errno::EBADF
+    rescue SystemCallError
       return false
     end
 

data/lib/capybara/session.rb

@@ -325,7 +325,7 @@ module Capybara
     #
     # Save a snapshot of the page and open it in a browser for inspection
     #
-    # @param  [String] path     The path to where it should be saved [optional]
+    # @param  [String] file_name  The path to where it should be saved [optional]
     #
     def save_and_open_page(file_name=nil)
       require "launchy"

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

@@ -51,6 +51,12 @@ Capybara::SpecHelper.spec "#fill_in" do
     extract_results(@session)['password'].should == 'supasikrit'
   end
 
+  it "should handle HTML in a textarea" do
+    @session.fill_in('form_description', :with => 'is <strong>very</strong> secret!')
+    @session.click_button('awesome')
+    extract_results(@session)['description'].should == 'is <strong>very</strong> secret!'
+  end
+
   it "should fill in a field with a custom type" do
     @session.fill_in('Schmooo', :with => 'Schmooo is the game')
     @session.click_button('awesome')
@@ -103,6 +109,12 @@ Capybara::SpecHelper.spec "#fill_in" do
     extract_results(@session)['first_name'].should == 'Harry'
   end
 
+  it "casts to string if field has maxlength", :focus => true do
+    @session.fill_in(:'form_zipcode', :with => 1234567)
+    @session.click_button('awesome')
+    extract_results(@session)['zipcode'].should == '12345'
+  end
+
   context 'on a pre-populated textfield with a reformatting onchange', :requires => [:js] do
     it 'should only trigger onchange once' do
       @session.visit('/with_js')

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

@@ -27,6 +27,12 @@ Capybara::SpecHelper.spec '#find' do
     @session.find(:css, "a#has-been-clicked").text.should include('Has been clicked')
   end
 
+  context "with :text option" do
+    it "casts text's argument to string" do
+      @session.find(:css, '.number', text: 42).should have_content("42")
+    end
+  end
+
   context "with :wait option", :requires => [:js] do
     it "should not wait for asynchronous load when `false` given" do
       @session.visit('/with_js')

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

@@ -57,6 +57,11 @@ Capybara::SpecHelper.spec "node" do
     it "should not swallow extra newlines in textarea" do
       @session.find('//textarea[@id="additional_newline"]').value.should == "\nbanana"
     end
+
+    it "return any HTML content in textarea" do
+      @session.find('//textarea[1]').set("some <em>html</em> here")
+      @session.find('//textarea[1]').value.should == "some <em>html</em> here"
+    end
   end
 
   describe "#set" do
@@ -71,18 +76,18 @@ Capybara::SpecHelper.spec "node" do
       @session.first('//input').set('')
       @session.first('//input').value.should == ''
     end
-    
+
     it "should not set if the text field is readonly" do
       @session.first('//input[@readonly]').value.should == 'should not change'
       @session.first('//input[@readonly]').set('changed')
       @session.first('//input[@readonly]').value.should == 'should not change'
     end
-    
+
     it "should not set if the textarea is readonly" do
       @session.first('//textarea[@readonly]').value.should == 'textarea should not change'
       @session.first('//textarea[@readonly]').set('changed')
       @session.first('//textarea[@readonly]').value.should == 'textarea should not change'
-    end      
+    end
   end
 
   describe "#tag_name" do
@@ -99,13 +104,13 @@ Capybara::SpecHelper.spec "node" do
       @session.find('//input[@id="customer_name"]').should be_disabled
       @session.find('//input[@id="customer_email"]').should_not be_disabled
     end
-    
+
     it "should see disabled options as disabled" do
       @session.visit('/form')
       @session.find('//select[@id="form_title"]/option[1]').should_not be_disabled
       @session.find('//select[@id="form_title"]/option[@disabled]').should be_disabled
     end
-    
+
     it "should see enabled options in disabled select as disabled" do
       @session.visit('/form')
       @session.find('//select[@id="form_disabled_select"]/option').should be_disabled
@@ -170,8 +175,8 @@ Capybara::SpecHelper.spec "node" do
       @session.find('//div[contains(., "Dropped!")]').should_not be_nil
     end
   end
-  
-  describe '#hover', :requires => [:hover] do  
+
+  describe '#hover', :requires => [:hover] do
     it "should allow hovering on an element" do
       pending "Selenium with firefox doesn't currently work with this (selenium with chrome does)" if @session.respond_to?(:mode) && @session.mode == :selenium && @session.driver.browser.browser == :firefox
       @session.visit('/with_hover')

data/lib/capybara/spec/spec_helper.rb

@@ -78,7 +78,7 @@ module Capybara
     end
 
     def extract_results(session)
-      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.text.lstrip
+      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
     end
   end
 end

data/lib/capybara/spec/views/with_html.erb

@@ -8,6 +8,8 @@
 <h2 class="head">Header Class Test Four</h2>
 <h2 class="head">Header Class Test Five</h2>
 
+<span class="number">42</span>
+
 <p class="para" id="first">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple">labore</a>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.1.0.beta1'
+  VERSION = '2.1.0.rc1'
 end

data/spec/server_spec.rb

@@ -98,4 +98,11 @@ describe Capybara::Server do
       Capybara.server {|app, port| Capybara.run_default_server(app, port)}
     end
   end
+
+  it "is not #responsive? when Net::HTTP raises a SystemCallError" do
+    app = lambda { [200, {}, ['Hello, world']] }
+    server = Capybara::Server.new(app)
+    Net::HTTP.should_receive(:start).and_raise(SystemCallError.allocate)
+    expect(server.responsive?).to eq false
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   TVNSZXpmMTlaVUZyMENxbEZjcnBCU3lPYWtTdFFMTThMYTNFQW1oT0VVYTJV
   RTJGSWdxNQpSMVNIMW5pKzNiSDdCNHRBa2JXc2tnPT0KLS0tLS1FTkQgQ0VS
   VElGSUNBVEUtLS0tLQo=
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri