capybara 0.3.5 → 0.3.6

data/History.txt

@@ -1,4 +1,52 @@
-=== 0.0.1 2009-11-04
+# Version 0.3.6
+
+Release date: 2010-03-22
+
+This is a maintainance release with minor bug fixes, should be
+drop in compatible.
+
+### Added
+
+* It's now possible to load in external drivers
+
+### Fixed
+
+* has_content? ignores whitespace
+* Trigger events when choosing radios and checking checkboxes under Selenium
+* Make Capybara.app totally optional when running without server
+* Changed fallback host so it matches the one set up by Rails' integration tests
+
+# Version 0.3.5
+
+Release date: 2010-02-26
+
+This is a mostly backwards compatible release, it does break
+the API in some minor places, which should hopefully not affect
+too many users, please read the release notes carefully!
+
+### Breaking
+
+* Relative searching in a node (e.g. find('//p').all('//a')) will now follow XPath standard
+  this means that if you want to find descendant nodes only, you'll need to prefix a dot!
+* `visit` now accepts fully qualified URLs for drivers that support it.
+* Capybara will always try to run a rack server, unless you set Capybara.run_sever = false
+
+### Changed
+
+* thin is preferred over mongrel and webrick, since it is Ruby 1.9 compatible
+* click_button and click will find <input type="button">, clicking them does nothing in RackTest
+
+### Added
+
+* Much improved error messages in a multitude of places
+* More semantic page querying with has_link?, has_button?, etc...
+* Option to ignore hidden elements when querying and interacting with the page
+* Support for multiple selects
+
+### Fixed
+
+* find_by_id is no longer broken
+* clicking links where the image's alt attribute contains the text is now possible
+* within_fieldset and within_table work when the default selector is CSS
+* boolean attributes work the same across drivers (return true/false)
 
-* 1 major enhancement:
-  * Initial release

data/README.rdoc

@@ -55,6 +55,9 @@ Now you can use it in your steps:
       click_link 'Sign in'
     end
 
+Please note that while Capybara uses XPath selectors by default, Cucumber explicitly
+changes this to CSS in `env.rb`.  See "XPath and CSS" below.
+
 == Default and current driver
 
 You can set up a default driver for your features. For example if you'd prefer
@@ -151,7 +154,7 @@ with the various form elements:
     fill_in('First Name', :with => 'John')
     fill_in('Password', :with => 'Seekrit')
     fill_in('Description', :with => 'Really Long Text…')
-    choose('An Option')
+    choose('A Radio Button')
     check('A Checkbox')
     uncheck('A Checkbox')
     attach_file('Image', '/path/to/image.jpg')
@@ -177,7 +180,7 @@ You can choose which kind of selector Capybara uses by default, by setting
 
 There are special methods for restricting the scope to a specific fieldset,
 identified by either an id or the text of the fieldet's legend tag, and to a
-specific table, identified by either idea or text of the table's caption tag.
+specific table, identified by either id or text of the table's caption tag.
 
     within_fieldset('Employee') do
       fill_in 'Name', :with => 'Jimmy'
@@ -255,7 +258,7 @@ is (the default is 2 seconds):
     Capybara.default_wait_time = 5
 
 Be aware that because of this behaviour, the following two statements are *not*
-identical, and you should *always* use the latter!
+equivalent, and you should *always* use the latter!
 
     page.should_not have_xpath('//a')
     page.should have_no_xpath('//a')
@@ -263,12 +266,12 @@ identical, and you should *always* use the latter!
 The former would incorrectly wait for the content to appear, since the
 asynchronous process has not yet removed the element from the page, it would
 therefore fail, even though the code might be working correctly. The latter
-correctly wait for the element to disappear from the page.
+correctly waits for the element to disappear from the page.
 
 == Using the DSL outside cucumber
 
 You can mix the DSL into any context, for example you could use it in RSpec
-examples. Just load the dsl and include it anywhere:
+examples. Just load the DSL and include it anywhere:
 
     require 'capybara'
     require 'capybara/dsl'
@@ -378,6 +381,8 @@ The following people have dedicated their time and effort to Capybara:
 * Bodaniel Jeanes
 * Carl Porth
 * Darrin Holst
+* Steven Parkes
+* Davide Marquês
 
 == License:
 

data/lib/capybara.rb

@@ -2,7 +2,7 @@ require 'timeout'
 require 'nokogiri'
 
 module Capybara
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 
   class CapybaraError < StandardError; end
   class DriverNotFoundError < CapybaraError; end

data/lib/capybara/driver/base.rb

@@ -19,6 +19,9 @@ class Capybara::Driver::Base
     false
   end
 
+  def wait_until *args
+  end
+
   def response_headers
     raise Capybara::NotSupportedByDriverError
   end
@@ -34,4 +37,8 @@ class Capybara::Driver::Base
   def cleanup!
   end
 
+  def has_shortcircuit_timeout?
+    false
+  end
+
 end

data/lib/capybara/driver/rack_test_driver.rb

@@ -28,9 +28,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
 
 
     def set(value)
-      if tag_name == 'input' and %w(text password hidden file).include?(type)
-        node['value'] = value.to_s
-      elsif tag_name == 'input' and type == 'radio'
+      if tag_name == 'input' and type == 'radio'
         driver.html.xpath("//input[@name='#{self[:name]}']").each { |node| node.remove_attribute("checked") }
         node['checked'] = 'checked'
       elsif tag_name == 'input' and type == 'checkbox'
@@ -39,6 +37,8 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
         else
           node.remove_attribute('checked')
         end
+      elsif tag_name == 'input'
+        node['value'] = value.to_s
       elsif tag_name == "textarea"
         node.content = value.to_s
       end
@@ -111,9 +111,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     def params(button)
       params = {}
 
-      text_fields = %w[text hidden password url color tel email search].map{|f| "@type='#{f}'"}.join(' or ')
-
-      node.xpath(".//input[#{text_fields}]").map do |input|
+      node.xpath(".//input[@type!='radio' and @type!='checkbox' and @type!='submit']").map do |input|
         merge_param!(params, input['name'].to_s, input['value'].to_s)
       end
       node.xpath(".//textarea").map do |textarea|
@@ -178,11 +176,10 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   end
 
   include ::Rack::Test::Methods
-  attr_reader :app, :html, :body
+  attr_reader :app
 
   alias_method :response, :last_response
   alias_method :request, :last_request
-  alias_method :source, :body
 
   def initialize(app)
     @app = app
@@ -192,7 +189,6 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     return if path.gsub(/^#{current_path}/, '') =~ /^#/
     get(path, attributes, env)
     follow_redirects!
-    cache_body
   end
 
   def current_url
@@ -207,17 +203,35 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     path = current_path if not path or path.empty?
     send(method, path, attributes, env)
     follow_redirects!
-    cache_body
   end
 
   def find(selector)
     html.xpath(selector).map { |node| Node.new(self, node) }
   end
+  
+  def body
+    @body ||= response.body
+  end
+  
+  def html
+    @html ||= Nokogiri::HTML(body)
+  end
+  alias_method :source, :body
 
+  def get(*args, &block); reset_cache; super; end
+  def post(*args, &block); reset_cache; super; end
+  def put(*args, &block); reset_cache; super; end
+  def delete(*args, &block); reset_cache; super; end
+  
 private
 
+  def reset_cache
+    @body = nil
+    @html = nil
+  end
+
   def build_rack_mock_session # :nodoc:
-    Rack::MockSession.new(app, Capybara.default_host || "example.org")
+    Rack::MockSession.new(app, Capybara.default_host || "www.example.com")
   end
 
   def current_path
@@ -244,9 +258,9 @@ private
     env
   end
 
-  def cache_body
-    @body = response.body
-    @html = Nokogiri::HTML(body)
+  def reset_cache
+    @body = nil
+    @html = nil
   end
 
 end

data/lib/capybara/driver/selenium_driver.rb

@@ -29,9 +29,9 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
         node.clear
         node.send_keys(value.to_s)
       elsif tag_name == 'input' and type == 'radio'
-        node.select
+        node.click
       elsif tag_name == 'input' and type == 'checkbox'
-        node.toggle
+        node.click
       end
     end
 

data/lib/capybara/node.rb

@@ -56,14 +56,5 @@ module Capybara
     def trigger(event)
       raise NotSupportedByDriverError
     end
-
-    private
-
-    def all_unfiltered(locator)
-      nodes = XPath.wrap(locator).scope(path).paths.map do |path|
-        driver.find(path)
-      end.flatten
-    end
-
   end
 end

data/lib/capybara/server.rb

@@ -55,6 +55,7 @@ class Capybara::Server
   end
 
   def boot
+    return self unless @app
     find_available_port
     Capybara.log "application has already booted" and return self if responsive?
     Capybara.log "booting Rack applicartion on port #{port}"

data/lib/capybara/session.rb

@@ -1,7 +1,9 @@
+require 'forwardable'
 require 'capybara/wait_until'
 
 module Capybara
   class Session
+    extend Forwardable
     include Searchable
 
     DSL_METHODS = [
@@ -15,41 +17,27 @@ module Capybara
 
     attr_reader :mode, :app
 
-    def initialize(mode, app)
+    def initialize(mode, app=nil)
       @mode = mode
       @app = app
     end
 
     def driver
-      @driver ||= case mode
-      when :rack_test
-        Capybara::Driver::RackTest.new(app)
-      when :selenium
-        Capybara::Driver::Selenium.new(app)
-      when :celerity
-        Capybara::Driver::Celerity.new(app)
-      when :culerity
-        Capybara::Driver::Culerity.new(app)
-      else
+      @driver ||= begin                    
+        string = mode.to_s
+        string.gsub!(%r{(^.)|(_.)}) { |m| m[m.length-1,1].upcase }
+        Capybara::Driver.const_get(string.to_sym).new(app)
+      rescue NameError
         raise Capybara::DriverNotFoundError, "no driver called #{mode} was found"
       end
     end
 
-    def cleanup!
-      driver.cleanup!
-    end
-
-    def current_url
-      driver.current_url
-    end
-
-    def response_headers
-      driver.response_headers
-    end
-
-    def visit(path)
-      driver.visit(path)
-    end
+    def_delegator :driver, :cleanup!
+    def_delegator :driver, :current_url
+    def_delegator :driver, :response_headers
+    def_delegator :driver, :visit
+    def_delegator :driver, :body
+    def_delegator :driver, :source
 
     def click(locator)
       msg = "no link or button '#{locator}' found"
@@ -107,14 +95,6 @@ module Capybara
       locate(:xpath, XPath.file_field(locator), msg).set(path)
     end
 
-    def body
-      driver.body
-    end
-
-    def source
-      driver.source
-    end
-
     def within(kind, scope=nil)
       kind, scope = Capybara.default_selector, kind unless scope
       scope = XPath.from_css(scope) if kind == :css
@@ -245,7 +225,7 @@ module Capybara
     end
 
     def wait_until(timeout = Capybara.default_wait_time)
-      WaitUntil.timeout(timeout) { yield }
+      WaitUntil.timeout(timeout,driver) { yield }
     end
 
     def evaluate_script(script)

data/lib/capybara/wait_until.rb

@@ -4,7 +4,7 @@ module Capybara
 
     class << self
 
-      def timeout(seconds = 1, &block)
+      def timeout(seconds = 1, driver = nil, &block)
         start_time = Time.now
 
         result = nil
@@ -12,9 +12,12 @@ module Capybara
         until result
           return result if result = yield
 
-          if (Time.now - start_time) > seconds
-             raise TimeoutError
+          delay = seconds - (Time.now - start_time)
+          if delay <= 0
+            raise TimeoutError
           end
+
+          driver && driver.wait_until(delay)
         end
       end
 

data/lib/capybara/xpath.rb

@@ -5,11 +5,6 @@ module Capybara
   class XPath
 
     class << self
-      def from_css(css)
-        Nokogiri::CSS.xpath_for(css).first
-      end
-      alias_method :for_css, :from_css
-
       def wrap(path)
         if path.is_a?(self)
           path
@@ -33,6 +28,27 @@ module Capybara
       @paths = paths
     end
 
+    def scope(scope)
+      XPath.new(*paths.map { |p| scope + p })
+    end
+
+    def to_s
+      @paths.join(' | ')
+    end
+
+    def append(path)
+      XPath.new(*[@paths, XPath.wrap(path).paths].flatten)
+    end
+
+    def prepend(path)
+      XPath.new(*[XPath.wrap(path).paths, @paths].flatten)
+    end
+
+    def from_css(css)
+      append(Nokogiri::CSS.xpath_for(css).first)
+    end
+    alias_method :for_css, :from_css
+
     def field(locator, options={})
       if options[:with]
         fillable_field(locator, options)
@@ -46,13 +62,11 @@ module Capybara
     end
 
     def fillable_field(locator, options={})
-      [:text, :password, :email, :url, :search, :tel, :color].inject(text_area(locator, options)) do |all, type|
-        all.input_field(type, locator, options)
-      end
+      text_area(locator, options).text_field(locator, options)
     end
 
     def content(locator)
-      append("/descendant-or-self::*[contains(.,#{s(locator)})]")
+      append("/descendant-or-self::*[contains(normalize-space(.),#{s(locator)})]")
     end
 
     def table(locator, options={})
@@ -84,6 +98,11 @@ module Capybara
       xpath = xpath.prepend("//button[@value=#{s(locator)} or text()=#{s(locator)}]")
     end
 
+    def text_field(locator, options={})
+      options = options.merge(:value => options[:with]) if options.has_key?(:with)
+      add_field(locator, "//input[@type!='radio' and @type!='checkbox' and @type!='hidden']", options)
+    end
+
     def text_area(locator, options={})
       options = options.merge(:text => options[:with]) if options.has_key?(:with)
       add_field(locator, "//textarea", options)
@@ -93,27 +112,6 @@ module Capybara
       add_field(locator, "//select", options)
     end
 
-    def input_field(type, locator, options={})
-      options = options.merge(:value => options[:with]) if options.has_key?(:with)
-      add_field(locator, "//input[@type='#{type}']", options)
-    end
-
-    def scope(scope)
-      XPath.new(*paths.map { |p| scope + p })
-    end
-
-    def to_s
-      @paths.join(' | ')
-    end
-
-    def append(path)
-      XPath.new(*[@paths, XPath.wrap(path).paths].flatten)
-    end
-
-    def prepend(path)
-      XPath.new(*[XPath.wrap(path).paths, @paths].flatten)
-    end
-
     def checkbox(locator, options={})
       input_field(:checkbox, locator, options)
     end
@@ -122,16 +120,17 @@ module Capybara
       input_field(:radio, locator, options)
     end
 
-    [:text, :password, :email, :url, :search, :tel, :color, :file].each do |type|
-      class_eval <<-RUBY, __FILE__, __LINE__+1
-        def #{type}_field(locator)
-          input_field(:#{type}, locator)
-        end
-      RUBY
+    def file_field(locator, options={})
+      input_field(:file, locator, options)
     end
 
   protected
 
+    def input_field(type, locator, options={})
+      options = options.merge(:value => options[:with]) if options.has_key?(:with)
+      add_field(locator, "//input[@type='#{type}']", options)
+    end
+
     # place this between to nodes to indicate that they should be siblings
     def sibling
       '/following-sibling::*[1]/self::'

data/spec/driver/celerity_driver_spec.rb

@@ -9,7 +9,6 @@ if RUBY_PLATFORM =~ /java/
     it_should_behave_like "driver"
     it_should_behave_like "driver with javascript support"
     it_should_behave_like "driver with header support"
-    it_should_behave_like "driver with node path support"
     
   end
 else

data/spec/dsl/fill_in_spec.rb

@@ -52,6 +52,19 @@ shared_examples_for "fill_in" do
       extract_results(@session)['password'].should == 'supasikrit'
     end
 
+    it "should fill in a field with a custom type" do
+      pending "selenium doesn't seem to find custom fields" if @session.mode == :selenium
+      @session.fill_in('Schmooo', :with => 'Schmooo is the game')
+      @session.click_button('awesome')
+      extract_results(@session)['schmooo'].should == 'Schmooo is the game'
+    end
+
+    it "should fill in a password field by name" do
+      @session.fill_in('form[password]', :with => 'supasikrit')
+      @session.click_button('awesome')
+      extract_results(@session)['password'].should == 'supasikrit'
+    end
+
     it "should fill in a password field by label" do
       @session.fill_in('Password', :with => 'supasikrit')
       @session.click_button('awesome')

data/spec/dsl/has_content_spec.rb

@@ -27,6 +27,11 @@ shared_examples_for "has_content" do
       @session.should have_content('exercitation ullamco laboris')
     end
 
+    it "should ignore extra whitespace and newlines" do
+      @session.visit('/with_html')
+      @session.should have_content('text with whitespace')
+    end
+
     it "should be false if the given content is not on the page" do
       @session.visit('/with_html')
       @session.should_not have_content('xxxxyzzz')

data/spec/public/test.js

@@ -27,4 +27,7 @@ $(function() {
   $('#with_focus_event').focus(function() {
     $('body').append('<p id="focus_event_triggered">Focus Event triggered</p>')
   });
-});
+  $('#checkbox_with_event').click(function() {
+    $('body').append('<p id="checkbox_event_triggered">Checkbox event triggered</p>')
+  });
+});

data/spec/server_spec.rb

@@ -10,6 +10,12 @@ describe Capybara::Server do
     
     @res.body.should include('Hello Server')
   end
+
+  it "should do nothing when no server given" do
+    running do
+      @server = Capybara::Server.new(nil).boot
+    end.should_not raise_error
+  end
   
   it "should find an available port" do
     @app1 = proc { |env| [200, {}, "Hello Server!"]}

data/spec/session_with_javascript_support_spec.rb

@@ -91,12 +91,17 @@ shared_examples_for "session with javascript support" do
       end
 
       it "should default to Capybara.default_wait_time before timeout" do
+        @session.driver # init the driver to exclude init timing from test
         start = Time.now
         Capybara.default_wait_time = 0.2
         begin
           @session.wait_until { false }
         rescue Capybara::TimeoutError; end
-        (Time.now - start).should be_close(0.2, 0.1)
+        if @session.driver.has_shortcircuit_timeout?
+          (Time.now - start).should be_close(0, 0.1)
+        else
+          (Time.now - start).should be_close(0.2, 0.1)
+        end
       end
     end
 
@@ -132,6 +137,14 @@ shared_examples_for "session with javascript support" do
       end
     end
 
+    describe '#check' do
+      it "should trigger associated events" do
+        @session.visit('/with_js')
+        @session.check('checkbox_with_event')
+        @session.should have_css('#checkbox_event_triggered');
+      end
+    end
+
     describe '#has_xpath?' do
       it "should wait for content to appear" do
         @session.visit('/with_js')

data/spec/views/form.erb

@@ -32,6 +32,11 @@
     <label for="form_name">Name</label>
     <input type="text" name="form[name]" value="John Smith" id="form_name"/>
   </p>
+
+  <p>
+    <label for="form_schmooo">Schmooo</label>
+    <input type="schmooo" name="form[schmooo]" value="This is Schmooo!" id="form_schmooo"/>
+  </p>
   
   <p>
     <label>Street<br/>

data/spec/views/with_html.erb

@@ -12,7 +12,10 @@
 <p id="second">
   Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
   dolore eu fugiat <a href="/redirect" id="red">Redirect</a> pariatur. Excepteur sint occaecat cupidatat non proident,
-  sunt in culpa qui officia deserunt mollit anim id est laborum.
+  sunt in culpa qui officia
+  text   with
+  whitespace
+  id est laborum.
 </p>
 
 <p>

data/spec/views/with_js.erb

@@ -30,5 +30,10 @@
     <p>
       <input type="text" name="with_focus_event" value="" id="with_focus_event"/>
     </p>
+
+    <p>
+      <input type="checkbox" id="checkbox_with_event"/>
+    </p>
   </body>
 </html>
+

data/spec/xpath_spec.rb

@@ -83,10 +83,8 @@ describe Capybara::XPath do
     end
     
     it "should be chainable" do
-      @query = @xpath.field('First Name').input_field(:password, 'First Name').to_s
+      @query = @xpath.field('First Name').button('Click me!').to_s
       @driver.find(@query).first.value.should == 'John'
-      @query = @xpath.field('Password').input_field(:password, 'Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
   
@@ -101,45 +99,11 @@ describe Capybara::XPath do
     end
 
     it "should be chainable" do
-      @query = @xpath.fillable_field('First Name').password_field('First Name').to_s
-      @driver.find(@query).first.value.should == 'John'
-      @query = @xpath.fillable_field('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
-    end
-  end
-
-  describe '#text_field' do
-    it "should find a text field by id or label" do
-      @query = @xpath.text_field('form_first_name').to_s
-      @driver.find(@query).first.value.should == 'John'
-      @query = @xpath.text_field('First Name').to_s
-      @driver.find(@query).first.value.should == 'John'
-    end
-
-    it "should be chainable" do
-      @query = @xpath.text_field('First Name').password_field('First Name').to_s
+      @query = @xpath.fillable_field('First Name').button('Click me!').to_s
       @driver.find(@query).first.value.should == 'John'
-      @query = @xpath.text_field('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
 
-  describe '#password_field' do
-    it "should find a password field by id or label" do
-      @query = @xpath.password_field('form_password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
-      @query = @xpath.password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
-    end
-
-    it "should be chainable" do
-      @query = @xpath.password_field('First Name').text_field('First Name').to_s
-      @driver.find(@query).first.value.should == 'John'
-      @query = @xpath.password_field('Password').text_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
-    end
-  end
-  
   describe '#text_area' do
     it "should find a text area by id or label" do
       @query = @xpath.text_area('form_description').to_s
@@ -149,10 +113,8 @@ describe Capybara::XPath do
     end
     
     it "should be chainable" do
-      @query = @xpath.text_area('Description').password_field('Description').to_s
+      @query = @xpath.text_area('Description').button('Click me!').to_s
       @driver.find(@query).first.text.should == 'Descriptive text goes here'
-      @query = @xpath.text_area('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
 
@@ -182,10 +144,8 @@ describe Capybara::XPath do
     end
     
     it "should be chainable" do
-      @query = @xpath.radio_button('Male').password_field('Male').to_s
+      @query = @xpath.radio_button('Male').button('Click me!').to_s
       @driver.find(@query).first.value.should == 'male'
-      @query = @xpath.radio_button('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
   
@@ -198,10 +158,8 @@ describe Capybara::XPath do
     end
     
     it "should be chainable" do
-      @query = @xpath.checkbox('Cat').password_field('Cat').to_s
+      @query = @xpath.checkbox('Cat').button('Click me!').to_s
       @driver.find(@query).first.value.should == 'cat'
-      @query = @xpath.checkbox('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
 
@@ -214,58 +172,9 @@ describe Capybara::XPath do
     end
     
     it "should be chainable" do
-      @query = @xpath.select('Region').password_field('Region').to_s
+      @query = @xpath.select('Region').button('Click me!').to_s
       @driver.find(@query).first[:name].should == 'form[region]'
-      @query = @xpath.select('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
-    end
-  end
-  
-  describe '#file_field' do
-    it "should find a file field by id or label" do
-      @query = @xpath.file_field('Document').to_s
-      @driver.find(@query).first[:name].should == 'form[document]'
-      @query = @xpath.file_field('form_document').to_s
-      @driver.find(@query).first[:name].should == 'form[document]'
-    end
-    
-    it "should be chainable" do
-      @query = @xpath.file_field('Document').password_field('Document').to_s
-      @driver.find(@query).first[:name].should == 'form[document]'
-      @query = @xpath.file_field('Password').password_field('Password').to_s
-      @driver.find(@query).first.value.should == 'seeekrit'
     end
   end
   
-  [ [:email_field, 'html5_email', 'Html5 Email', 'person@email.com'],
-    [:url_field, 'html5_url', 'Html5 Url', 'http://www.example.com'],
-    [:search_field, 'html5_search', 'Html5 Search', 'what are you looking for'],
-    [:tel_field, 'html5_tel', 'Html5 Tel', '911'],
-    [:color_field, 'html5_color', 'Html5 Color', '#FFF']].each do |method, id, label, output|
-    describe "##{method}" do
-      it "should find a file field by label" do
-        @query = @xpath.send(method, label).to_s
-        @driver.find(@query).first.value.should == output
-      end
-      
-      it "should find a file field by id" do
-        @query = @xpath.send(method, id).to_s
-        @driver.find(@query).first.value.should == output
-      end
-        
-      it "should be chainable" do
-        @query = @xpath.send(method, label).password_field(label).to_s
-        @driver.find(@query).first.value.should == output
-        @query = @xpath.send(method, 'Password').password_field('Password').to_s
-        @driver.find(@query).first.value.should == 'seeekrit'
-      end
-      
-      it "should be a #fillable_field" do
-        @query = @xpath.fillable_field(label).to_s
-        @driver.find(@query).first.value.should == output
-      end
-    end
-    
-  end
-  
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,99 +14,134 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +01:00
+date: 2010-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 16
         version: "1.16"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: culerity
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 4
         version: 0.2.4
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-    version: 
+  type: :development
+  version_requirements: *id009
 description: |-
   Capybara aims to simplify the process of integration testing Rack applications,
   such as Rails, Sinatra or Merb. It is inspired by and aims to replace Webrat as
@@ -220,18 +260,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: capybara
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Capybara aims to simplify the process of integration testing Rack applications, such as Rails, Sinatra or Merb