capybara 0.3.8 → 0.3.9

data/History.txt

@@ -1,3 +1,24 @@
+# Version 0.3.9
+
+Release data: 2010-07-03
+
+### Added
+
+* status_code which returns the HTTP status code of the last response (no Selenium!)
+* Capybara.save_and_open_page to store tempfiles
+* RackTest and Culerity drivers now clean up after themselves properly
+
+### Fixed
+
+* When no rack app is set and the app is called, a more descriptive error is raised
+* select now works with optgroups
+* Don't submit image buttons unless they were clicked under rack-test
+* Support custom field types under Selenium
+* Support input fields without a type, treat them as though they were text fields
+* Redirect now throws an error after 5 redirects, as per RFC
+* Selenium now properly raises an error when Node#trigger is called
+* Node#value now returns the correct value for textareas under rack-test
+
 # Version 0.3.8
 
 Release date: 2010-05-12

data/README.rdoc

@@ -8,7 +8,8 @@ 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
 a DSL for interacting with a webapplication. It is agnostic about the driver
 running your tests and currently comes bundled with rack-test, Culerity,
-Celerity and Selenium support built in.
+Celerity and Selenium support built in. env.js support is available as the
+{capybara-envjs gem}[http://github.com/smparkes/capybara-envjs].
 
 == Install:
 
@@ -123,6 +124,16 @@ being.
 Install celerity as noted above, make sure JRuby is in your path. Note that
 Culerity doesn't seem to be working under Ruby 1.9 at the moment.
 
+== env.js
+
+The {capybara-envjs driver}[http://github.com/smparkes/capybara-envjs]
+uses the envjs gem ({GitHub}[http://github.com/smparkes/env-js],
+{rubygems.org}[http://rubygems.org/gems/envjs]) to interpret
+JavaScript outside the browser. The driver is installed by installing the capybara-envjs gem:
+  gem install capybara-envjs
+More info about the driver and env.js are available through the links above. The envjs gem only supports
+Ruby 1.8.7 at this time.
+
 == The DSL
 
 Capybara's DSL is inspired by Webrat. While backwards compatibility is retained
@@ -141,6 +152,10 @@ You can use the <tt>visit</tt> method to navigate to other pages:
 The visit method only takes a single parameter, the request method is *always*
 GET.
 
+You can get the current path of the browsing session for test assertions:
+
+    current_path.should == post_comments_path(post)
+
 === Clicking links and buttons
 
 You can interact with the webapp by following links and buttons. Capybara
@@ -196,6 +211,17 @@ specific table, identified by either id or text of the table's caption tag.
       fill_in 'Name', :with => 'Jimmy'
     end
 
+You can also specify a scope to be used for future searches with the <tt>scope_to</tt>.
+It returns a handle to the session scoped to the provided selector.
+
+    scope = page.scope_to("//div[@id='foo']")
+    scope.has_xpath("//a[@class='bar']")
+
+You can also chain scopes by calling <tt>scope_to</tt> on an existing scope.
+
+    more_scope = scope.scope_to("//p")
+    more_scope.has_xpath("//a[@class='baz']")
+
 === Querying
 
 Capybara has a rich set of options for querying the page for the existence of
@@ -228,7 +254,12 @@ You can also find specific elements, in order to manipulate them:
 
 === Scripting
 
-In drivers which support it, you can easily evaluate JavaScript:
+In drivers which support it, you can easily execute JavaScript:
+
+    page.execute_script("$('body').empty()")
+
+For simple expressions, you can return the result of the script. Note
+that this may break with more complicated expressions:
 
     result = page.evaluate_script('4 + 4');
 

data/lib/capybara.rb

@@ -11,15 +11,16 @@ module Capybara
   class TimeoutError < CapybaraError; end
   class LocateHiddenElementError < CapybaraError; end
   class InfiniteRedirectError < TimeoutError; end
-  
+
   class << self
     attr_accessor :debug, :asset_root, :app_host, :run_server, :default_host
     attr_accessor :default_selector, :default_wait_time, :ignore_hidden_elements
+    attr_accessor :save_and_open_page_path
 
     def default_selector
       @default_selector ||= :xpath
     end
-    
+
     def default_wait_time
       @default_wait_time ||= 2
     end
@@ -29,14 +30,14 @@ module Capybara
       true
     end
   end
-  
+
   autoload :Server,     'capybara/server'
   autoload :Session,    'capybara/session'
   autoload :Node,       'capybara/node'
   autoload :XPath,      'capybara/xpath'
   autoload :Searchable, 'capybara/searchable'
   autoload :VERSION,    'capybara/version'
-  
+
   module Driver
     autoload :Base,     'capybara/driver/base'
     autoload :RackTest, 'capybara/driver/rack_test_driver'

data/lib/capybara/driver/base.rb

@@ -3,6 +3,10 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
+  def current_path
+    URI.parse(current_url).path
+  end
+
   def visit(path)
     raise NotImplementedError
   end
@@ -11,6 +15,10 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
+  def execute_script(script)
+    raise Capybara::NotSupportedByDriverError
+  end
+
   def evaluate_script(script)
     raise Capybara::NotSupportedByDriverError
   end
@@ -25,6 +33,10 @@ class Capybara::Driver::Base
   def response_headers
     raise Capybara::NotSupportedByDriverError
   end
+  
+  def status_code
+    raise Capybara::NotSupportedByDriverError
+  end
 
   def body
     raise NotImplementedError

data/lib/capybara/driver/celerity_driver.rb

@@ -72,7 +72,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     def path
       node.xpath
     end
-    
+
     def trigger(event)
       node.fire_event(event.to_s)
     end
@@ -102,7 +102,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
   def current_url
     browser.url
   end
-  
+
   def source
     browser.html
   end
@@ -115,12 +115,21 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     browser.response_headers
   end
 
+  def status_code
+    browser.status_code
+  end
+
   def find(selector)
     browser.elements_by_xpath(selector).map { |node| Node.new(self, node) }
   end
 
   def wait?; true; end
 
+  def execute_script(script)
+    browser.execute_script script
+    nil
+  end
+
   def evaluate_script(script)
     browser.execute_script "#{script}"
   end
@@ -134,6 +143,10 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     @_browser
   end
 
+  def cleanup!
+    browser.clear_cookies
+  end
+
 private
 
   def url(path)

data/lib/capybara/driver/rack_test_driver.rb

@@ -26,6 +26,13 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
       end
     end
 
+    def value
+      if tag_name == 'textarea'
+        node.content
+      else
+        super
+      end
+    end
 
     def set(value)
       if tag_name == 'input' and type == 'radio'
@@ -112,7 +119,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     def params(button)
       params = {}
 
-      node.xpath(".//input[@type!='radio' and @type!='checkbox' and @type!='submit']").map do |input|
+      node.xpath(".//input[not(@type) or (@type!='radio' and @type!='checkbox' and @type!='submit' and @type!='image')]").map do |input|
         merge_param!(params, input['name'].to_s, input['value'].to_s)
       end
       node.xpath(".//textarea").map do |textarea|
@@ -183,6 +190,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   alias_method :request, :last_request
 
   def initialize(app)
+    raise ArgumentError, "rack-test requires a rack application, but none was given" unless app
     @app = app
   end
 
@@ -191,7 +199,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   end
 
   def process(method, path, attributes = {})
-    return if path.gsub(/^#{current_path}/, '') =~ /^#/
+    return if path.gsub(/^#{request_path}/, '') =~ /^#/
     send(method, path, attributes, env)
     follow_redirects!
   end
@@ -204,8 +212,12 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     response.headers
   end
 
+  def status_code
+    response.status
+  end
+
   def submit(method, path, attributes)
-    path = current_path if not path or path.empty?
+    path = request_path if not path or path.empty?
     send(method, path, attributes, env)
     follow_redirects!
   end
@@ -213,21 +225,32 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   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 cleanup!
+    clear_cookies
+  end
+
   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
-  
+
+  def follow_redirects!
+    5.times do
+      follow_redirect! if response.redirect?
+    end
+    raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects." if response.redirect?
+  end
+
 private
 
   def reset_cache
@@ -239,20 +262,10 @@ private
     Rack::MockSession.new(app, Capybara.default_host || "www.example.com")
   end
 
-  def current_path
+  def request_path
     request.path rescue ""
   end
 
-  def follow_redirects!
-    Capybara::WaitUntil.timeout(4) do
-      redirect = response.redirect?
-      follow_redirect! if redirect
-      not redirect
-    end
-  rescue Capybara::TimeoutError
-    raise Capybara::InfiniteRedirectError, "infinite redirect detected!"
-  end
-
   def env
     env = {}
     begin
@@ -263,9 +276,4 @@ private
     env
   end
 
-  def reset_cache
-    @body = nil
-    @html = nil
-  end
-
 end

data/lib/capybara/driver/selenium_driver.rb

@@ -25,18 +25,18 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
     end
 
     def set(value)
-      if tag_name == 'textarea' or (tag_name == 'input' and %w(text password hidden file).include?(type))
-        node.clear
-        node.send_keys(value.to_s)
-      elsif tag_name == 'input' and type == 'radio'
+      if tag_name == 'input' and type == 'radio'
         node.click
       elsif tag_name == 'input' and type == 'checkbox'
         node.click if node.attribute('checked') != value
+      elsif tag_name == 'textarea' or tag_name == 'input'
+        node.clear
+        node.send_keys(value.to_s)
       end
     end
 
     def select(option)
-      option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
+      option_node = node.find_element(:xpath, ".//option[normalize-space(text())=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
       option_node.select
     rescue 
       options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -49,7 +49,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       end
 
       begin
-        option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
+        option_node = node.find_element(:xpath, ".//option[normalize-space(text())=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
         option_node.clear
       rescue
         options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -73,9 +73,6 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       node.displayed? and node.displayed? != "false"
     end
     
-    def trigger(event)
-    end
-
   private
 
     def all_unfiltered(locator)
@@ -128,6 +125,10 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
 
   def wait?; true; end
 
+  def execute_script(script)
+    browser.execute_script script
+  end
+
   def evaluate_script(script)
     browser.execute_script "return #{script}"
   end

data/lib/capybara/rails.rb

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

data/lib/capybara/save_and_open_page.rb

@@ -3,8 +3,11 @@ module Capybara
     extend(self)
 
     def save_and_open_page(html)
-      name="capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}.html"
+      name = File.join(*[Capybara.save_and_open_page_path, "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}.html"].compact)
 
+      unless Capybara.save_and_open_page_path.nil? || File.directory?(Capybara.save_and_open_page_path )
+        FileUtils.mkdir_p(Capybara.save_and_open_page_path)
+      end
       FileUtils.touch(name) unless File.exist?(name)
 
       tempfile = File.new(name,'w')

data/lib/capybara/session.rb

@@ -12,7 +12,7 @@ module Capybara
       :has_no_content?, :has_no_css?, :has_no_xpath?, :has_xpath?, :locate, :save_and_open_page, :select, :source, :uncheck,
       :visit, :wait_until, :within, :within_fieldset, :within_table, :within_frame, :has_link?, :has_no_link?, :has_button?,
       :has_no_button?,    :has_field?, :has_no_field?, :has_checked_field?, :has_unchecked_field?, :has_no_table?, :has_table?,
-      :unselect, :has_select?, :has_no_select?
+      :unselect, :has_select?, :has_no_select?, :current_path, :scope_to
     ]
 
     attr_reader :mode, :app
@@ -34,7 +34,9 @@ module Capybara
 
     def_delegator :driver, :cleanup!
     def_delegator :driver, :current_url
+    def_delegator :driver, :current_path
     def_delegator :driver, :response_headers
+    def_delegator :driver, :status_code
     def_delegator :driver, :visit
     def_delegator :driver, :body
     def_delegator :driver, :source
@@ -126,6 +128,14 @@ module Capybara
       end
     end
 
+    def scope_to(*locator)
+      scoped_session = self.clone
+      scoped_session.instance_eval do
+        @scopes = scopes + locator
+      end
+      scoped_session
+    end
+
     def has_xpath?(path, options={})
       wait_conditionally_until do
         results = all(:xpath, path, options)
@@ -227,7 +237,7 @@ module Capybara
     def locate(kind_or_locator, locator=nil, fail_msg = nil)
       node = wait_conditionally_until { find(kind_or_locator, locator) }
     ensure
-      raise Capybara::ElementNotFound, fail_msg || "Unable to locate '#{kind_or_locator}'" unless node
+      raise Capybara::ElementNotFound, fail_msg || "Unable to locate '#{locator || kind_or_locator}'" unless node
       return node
     end
 
@@ -235,6 +245,10 @@ module Capybara
       WaitUntil.timeout(timeout,driver) { yield }
     end
 
+    def execute_script(script)
+      driver.execute_script(script)
+    end
+
     def evaluate_script(script)
       driver.evaluate_script(script)
     end

data/lib/capybara/spec/driver.rb

@@ -1,6 +1,6 @@
 require 'capybara/spec/test_app'
 
-Dir[File.dirname(__FILE__)+'/driver/*'].each { |group| 
+Dir[File.dirname(__FILE__)+'/driver/*'].each { |group|
   require group
 }
 
@@ -13,11 +13,16 @@ shared_examples_for 'driver' do
       @driver.visit('/foo')
       @driver.body.should include('Another World')
     end
-    
+
     it "should show the correct URL" do
       @driver.visit('/foo')
       @driver.current_url.should include('/foo')
     end
+
+    it 'should show the correct location' do
+      @driver.visit('/foo')
+      @driver.current_path.should == '/foo'
+    end
   end
 
   describe '#body' do
@@ -55,6 +60,10 @@ shared_examples_for 'driver' do
         @driver.find('//input[@id="checked_field"]')[0][:checked].should be_true
       end
 
+      it "should allow retrieval of the value" do
+        @driver.find('//textarea').first.value.should == 'banana'
+      end
+
       it "should allow assignment of field value" do
         @driver.find('//input').first.value.should == 'monkey'
         @driver.find('//input').first.set('gorilla')
@@ -66,10 +75,10 @@ shared_examples_for 'driver' do
         @driver.find('//a')[1].tag_name.should == 'a'
         @driver.find('//p')[1].tag_name.should == 'p'
       end
-      
+
       it "should extract node visibility" do
         @driver.find('//a')[0].should be_visible
-        
+
         @driver.find('//div[@id="hidden"]')[0].should_not be_visible
         @driver.find('//div[@id="hidden_via_ancestor"]')[0].should_not be_visible
       end
@@ -81,7 +90,7 @@ shared_examples_for 'driver' do
       @driver.visit('/tables')
       @node = @driver.find('//body').first
     end
-  
+
     it "should be able to navigate/search child node" do
       @node.all('//table').size.should == 5
       @node.find('//form').all('.//table').size.should == 1
@@ -95,7 +104,6 @@ shared_examples_for 'driver' do
       end
     end
   end
-
 end
 
 shared_examples_for "driver with javascript support" do
@@ -130,6 +138,22 @@ shared_examples_for "driver with header support" do
   end
 end
 
+shared_examples_for "driver with status code support" do
+  it "should make the status code available through status_code" do
+    @driver.visit('/with_simple_html')
+    @driver.status_code.should == 200
+  end
+end
+
+shared_examples_for "driver without status code support" do
+  it "should raise when trying to access the status code available through status_code" do
+    @driver.visit('/with_simple_html')
+    lambda {
+      @driver.status_code
+    }.should raise_error(Capybara::NotSupportedByDriverError)
+  end
+end
+
 shared_examples_for "driver with frame support" do
   describe '#within_frame' do
     before(:each) do
@@ -160,3 +184,35 @@ shared_examples_for "driver with frame support" do
     end
   end
 end
+
+shared_examples_for "driver with cookies support" do
+  describe "#cleanup" do
+    it "should set and clean cookies" do
+      @driver.visit('/get_cookie')
+      @driver.body.should_not include('test_cookie')
+
+      @driver.visit('/set_cookie')
+      @driver.body.should include('Cookie set to test_cookie')
+
+      @driver.visit('/get_cookie')
+      @driver.body.should include('test_cookie')
+
+      @driver.cleanup!
+      @driver.visit('/get_cookie')
+      @driver.body.should_not include('test_cookie')
+    end
+  end
+end
+
+shared_examples_for "driver with infinite redirect detection" do
+  it "should follow 5 redirects" do
+    @driver.visit('/redirect/5/times')
+    @driver.body.should include('redirection complete')
+  end
+
+  it "should not follow more than 5 redirects" do
+    running do
+      @driver.visit('/redirect/6/times')
+    end.should raise_error(Capybara::InfiniteRedirectError)
+  end
+end

data/lib/capybara/spec/session.rb

@@ -39,6 +39,52 @@ shared_examples_for "session" do
     end
   end
 
+  describe '#scope_to' do
+    let(:scope) { @session.scope_to("//p[@id='first']") }
+    let(:more_scope) { scope.scope_to("//a[@id='foo']") }
+
+    before do
+      @session.visit('/with_html')
+    end
+
+    it 'has a simple link' do
+      scope.should have_xpath("//a[@class='simple']")
+    end
+
+    it 'does not have a redirect link' do
+      scope.should have_no_xpath("//a[@id='red']")
+    end
+
+    it 'does have a redirect link' do
+      @session.should have_xpath("//a[@id='red']")
+    end
+
+    it 'does not share scopes' do
+      @session.should have_xpath("//a[@id='red']")
+      scope.should have_no_xpath("//a[@id='red']")
+      @session.should have_xpath("//a[@id='red']")
+    end
+
+    context 'more_scope' do
+      it 'has the text for foo' do
+        more_scope.should have_content('ullamco')
+      end
+
+      it 'does not have a simple link' do
+        more_scope.should have_no_xpath("//a[@class='simple']")
+      end
+
+      it 'has not overridden scope' do
+        scope.should have_xpath("//a[@class='simple']")
+      end
+
+      it 'has not overridden session' do
+        @session.should have_xpath("//p[@id='second']")
+      end
+    end
+
+  end
+
   it_should_behave_like "all"
   it_should_behave_like "attach_file"
   it_should_behave_like "check"

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

@@ -207,6 +207,12 @@ shared_examples_for "click_button" do
       @results = extract_results(@session)
       @results['no_value'].should_not be_nil
     end
+    
+    it "should not send image buttons that were not clicked" do
+      @session.click_button('Click me!')
+      @results = extract_results(@session)
+      @results['okay'].should be_nil
+    end
 
     it "should serialize and send GET forms" do
       @session.visit('/form')
@@ -218,6 +224,7 @@ shared_examples_for "click_button" do
 
     it "should follow redirects" do
       @session.click_button('Go FAR')
+      @session.current_url.should match(%r{/landed$})
       @session.body.should include('You landed')
     end
 

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

@@ -22,6 +22,12 @@ shared_examples_for "fill_in" do
       extract_results(@session)['street'].should == 'Avenue Q'
     end
 
+    it "should fill in a url field by label without for" do
+      @session.fill_in('Html5 Url', :with => 'http://www.avenueq.com')
+      @session.click_button('html5_submit')
+      extract_results(@session)['html5_url'].should == 'http://www.avenueq.com'
+    end
+
     it "should favour exact label matches over partial matches" do
       @session.fill_in('Name', :with => 'Harry Jones')
       @session.click_button('awesome')
@@ -53,12 +59,17 @@ shared_examples_for "fill_in" do
     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 field without a type" do
+      @session.fill_in('Phone', :with => '+1 555 7022')
+      @session.click_button('awesome')
+      extract_results(@session)['phone'].should == '+1 555 7022'
+    end
+
     it "should fill in a password field by name" do
       @session.fill_in('form[password]', :with => 'supasikrit')
       @session.click_button('awesome')

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

@@ -35,12 +35,20 @@ shared_examples_for "session with javascript support" do
     end
 
     describe "#evaluate_script" do
-      it "should return the evaluated script" do
+      it "should evaluate the given script and return whatever it produces" do
         @session.visit('/with_js')
         @session.evaluate_script("1+3").should == 4
       end
     end
 
+    describe "#execute_script" do
+      it "should execute the given script and return nothing" do
+        @session.visit('/with_js')
+        @session.execute_script("$('#change').text('Funky Doodle')").should be_nil
+        @session.should have_css('#change', :text => 'Funky Doodle')
+      end
+    end
+
     describe '#locate' do
       it "should wait for asynchronous load" do
         @session.visit('/with_js')

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

@@ -38,6 +38,12 @@ shared_examples_for "locate" do
       end.should raise_error(Capybara::ElementNotFound, "arghh")
     end
 
+    it "should raise ElementNotFound with a useful default message if nothing was found" do
+      running do
+        @session.locate(:xpath, '//div[@id="nosuchthing"]').should be_nil
+      end.should raise_error(Capybara::ElementNotFound, "Unable to locate '//div[@id=\"nosuchthing\"]'")
+    end
+
     it "should accept an XPath instance and respect the order of paths" do
       @session.visit('/form')
       @xpath = Capybara::XPath.text_field('Name')

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

@@ -0,0 +1,19 @@
+shared_examples_for "session with status code support" do
+  describe '#status_code' do
+    it "should return response codes" do
+      @session.visit('/with_simple_html')     
+      @session.status_code.should == 200
+    end
+  end
+end
+
+shared_examples_for "session without status code support" do
+  describe "#status_code" do
+    before{ @session.visit('/with_simple_html') }
+    it "should raise an error" do
+      running {
+        @session.status_code
+      }.should raise_error(Capybara::NotSupportedByDriverError)
+    end
+  end
+end

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

@@ -37,6 +37,20 @@ shared_examples_for "select" do
       extract_results(@session)['locale'].should == 'jo'
     end
 
+    it "should obey from" do
+      @session.select("Miss", :from => "Other title")
+      @session.click_button('awesome')
+      results = extract_results(@session)
+      results['other_title'].should == "Miss"
+      results['title'].should_not == "Miss"
+    end
+
+    it "show match labels with preceding or trailing whitespace" do
+      @session.select("Lojban", :from => 'Locale')
+      @session.click_button('awesome')
+      extract_results(@session)['locale'].should == 'jbo'
+    end
+
     context "with a locator that doesn't exist" do
       it "should raise an error" do
         running { @session.select('foo', :from => 'does not exist') }.should raise_error(Capybara::ElementNotFound)

data/lib/capybara/spec/test_app.rb

@@ -13,7 +13,7 @@ class TestApp < Sinatra::Base
   get '/foo' do
     'Another World'
   end
-  
+
   get '/redirect' do
     redirect '/redirect_again'
   end
@@ -22,6 +22,15 @@ class TestApp < Sinatra::Base
     redirect '/landed'
   end
 
+  get '/redirect/:times/times' do
+    times = params[:times].to_i
+    if times.zero?
+      "redirection complete"
+    else
+      redirect "/redirect/#{times - 1}/times"
+    end
+  end
+
   get '/landed' do
     "You landed"
   end
@@ -33,7 +42,7 @@ class TestApp < Sinatra::Base
   get '/form/get' do
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end
-  
+
   get '/favicon.ico' do
     nil
   end
@@ -50,6 +59,16 @@ class TestApp < Sinatra::Base
     redirect back
   end
 
+  get '/set_cookie' do
+    cookie_value = 'test_cookie'
+    response.set_cookie('capybara', cookie_value)
+    "Cookie set to #{cookie_value}"
+  end
+
+  get '/get_cookie' do
+    request.cookies['capybara']
+  end
+
   get '/:view' do |view|
     erb view.to_sym
   end

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

@@ -11,6 +11,16 @@
     </select>
   </p>
 
+
+  <p>
+    <label for="form_other_title">Other title</label>
+    <select name="form[other_title]" id="form_other_title">
+      <option>Mrs</option>
+      <option>Mr</option>
+      <option>Miss</option>
+    </select>
+  </p>
+
   <p>
     <label for="form_first_name">
       First Name
@@ -46,7 +56,7 @@
 
   <p>
     <label for="form_phone">Phone</label>
-    <input type="text" name="form[phone]" value="+1 555 7021" id="form_phone"/>
+    <input name="form[phone]" value="+1 555 7021" id="form_phone"/>
   </p>
 
   <p>
@@ -77,6 +87,7 @@
       <option value="fi">Finish</option>
       <option value="no">Norwegian</option>
       <option value="jo">John's made-up language</option>
+      <option value="jbo"> Lojban </option>
     </select>
   </p>
 

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

@@ -20,6 +20,7 @@
 
 <p>
   <input type="text" id="test_field" value="monkey"/>
+  <textarea>banana</textarea>
   <a href="/redirect_back">BackToMyself</a>
   <a title="twas a fine link" href="/redirect">A link came first</a>
   <a title="a fine link" href="/with_simple_html">A link</a>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

data/lib/capybara/xpath.rb

@@ -111,7 +111,7 @@ module Capybara
 
     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)
+      add_field(locator, "//input[not(@type) or (@type!='radio' and @type!='checkbox' and @type!='hidden')]", options)
     end
 
     def text_area(locator, options={})
@@ -163,8 +163,8 @@ module Capybara
           when :text      then postfix += "[text()=#{s(value)}]"
           when :checked   then postfix += "[@checked]"
           when :unchecked then postfix += "[not(@checked)]"
-          when :options   then postfix += value.map { |o| "[./option/text()=#{s(o)}]" }.join
-          when :selected  then postfix += [value].flatten.map { |o| "[./option[@selected]/text()=#{s(o)}]" }.join
+          when :options   then postfix += value.map { |o| "[.//option/text()=#{s(o)}]" }.join
+          when :selected  then postfix += [value].flatten.map { |o| "[.//option[@selected]/text()=#{s(o)}]" }.join
         end
         postfix
       end

data/spec/driver/celerity_driver_spec.rb

@@ -9,7 +9,8 @@ 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 status code support"
+    it_should_behave_like "driver with cookies support"
   end
 else
   puts "#{File.basename(__FILE__)} requires JRuby; skipping.."

data/spec/driver/culerity_driver_spec.rb

@@ -4,9 +4,10 @@ describe Capybara::Driver::Culerity do
   before(:all) do
     @driver = Capybara::Driver::Culerity.new(TestApp)
   end
-  
+
   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 status code support"
+  it_should_behave_like "driver with cookies support"
 end

data/spec/driver/rack_test_driver_spec.rb

@@ -4,8 +4,16 @@ describe Capybara::Driver::RackTest do
   before do
     @driver = Capybara::Driver::RackTest.new(TestApp)
   end
-  
+
+  it "should throw an error when no rack app is given" do
+    running do
+      Capybara::Driver::RackTest.new(nil)
+    end.should raise_error(ArgumentError)
+  end
+
   it_should_behave_like "driver"
   it_should_behave_like "driver with header support"
-  
+  it_should_behave_like "driver with status code support"
+  it_should_behave_like "driver with cookies support"
+  it_should_behave_like "driver with infinite redirect detection"
 end

data/spec/driver/remote_culerity_driver_spec.rb

@@ -13,11 +13,12 @@ describe Capybara::Driver::Culerity do
   end
 
   it "should navigate to a fully qualified remote page" do
-    @driver.visit('http://elabs.se/contact')
-    @driver.body.should include('Edithouse eLabs AB')
+    @driver.visit('http://capybara-testapp.heroku.com/foo')
+    @driver.body.should include('Another World')
   end
   
   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 status code support"
 end

data/spec/driver/remote_selenium_driver_spec.rb

@@ -15,4 +15,5 @@ describe Capybara::Driver::Selenium do
 
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
+  it_should_behave_like "driver without status code support"
 end

data/spec/driver/selenium_driver_spec.rb

@@ -8,4 +8,6 @@ describe Capybara::Driver::Selenium do
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with frame support"
+  it_should_behave_like "driver without status code support"
+  it_should_behave_like "driver with cookies support"
 end

data/spec/save_and_open_page_spec.rb

@@ -5,18 +5,12 @@ require 'launchy'
 describe Capybara::SaveAndOpenPage do
   describe "#save_save_and_open_page" do
     before do
-
       @time = Time.new.strftime("%Y%m%d%H%M%S")
-      @name = "capybara-#{@time}.html"
 
       @temp_file = mock("FILE")
       @temp_file.stub!(:write)
       @temp_file.stub!(:close)
-      @temp_file.stub!(:path).and_return(@name)
-
-      File.should_receive(:exist?).and_return true
-      File.should_receive(:new).and_return @temp_file
-
+      
       @html = <<-HTML
         <html>
           <head>
@@ -30,14 +24,60 @@ describe Capybara::SaveAndOpenPage do
       Launchy::Browser.stub(:run)
     end
 
-    it "should create a new temporary file" do
-      @temp_file.should_receive(:write).with @html
-      Capybara::SaveAndOpenPage.save_and_open_page @html
+    describe "defaults" do
+      before do
+        @name = "capybara-#{@time}.html"
+        
+        @temp_file.stub!(:path).and_return(@name)
+
+        File.should_receive(:exist?).and_return true
+        File.should_receive(:new).and_return @temp_file
+      end
+      
+      it "should create a new temporary file" do
+        @temp_file.should_receive(:write).with @html
+        Capybara::SaveAndOpenPage.save_and_open_page @html
+      end
+
+      it "should open the file in the browser" do
+        Capybara::SaveAndOpenPage.should_receive(:open_in_browser).with(@name)
+        Capybara::SaveAndOpenPage.save_and_open_page @html
+      end
     end
+    
+    describe "custom output path" do
+      before do
+        @custom_path = File.join('tmp', 'capybara')
+        @custom_name = File.join(@custom_path, "capybara-#{@time}.html")
 
-    it "should open the file in the browser" do
-      Capybara::SaveAndOpenPage.should_receive(:open_in_browser).with(@name)
-      Capybara::SaveAndOpenPage.save_and_open_page @html
+        @temp_file.stub!(:path).and_return(@custom_name)
+        
+        Capybara.should_receive(:save_and_open_page_path).at_least(:once).and_return(@custom_path)
+      end
+      
+      it "should create a new temporary file in the custom path" do
+        File.should_receive(:directory?).and_return true
+        File.should_receive(:exist?).and_return true
+        File.should_receive(:new).and_return @temp_file
+        
+        @temp_file.should_receive(:write).with @html
+        Capybara::SaveAndOpenPage.save_and_open_page @html
+      end
+      
+      it "should open the file - in the custom path - in the browser" do
+        Capybara::SaveAndOpenPage.should_receive(:open_in_browser).with(@custom_name)
+        Capybara::SaveAndOpenPage.save_and_open_page @html
+      end
+      
+      it "should be possible to configure output path" do
+        Capybara.should respond_to(:save_and_open_page_path)
+        default_setting = Capybara.save_and_open_page_path
+        lambda {
+            Capybara.save_and_open_page_path = File.join('tmp', 'capybara')
+            Capybara.save_and_open_page_path.should == File.join('tmp', 'capybara')
+          }.should_not raise_error
+        Capybara.save_and_open_page_path = default_setting
+      end
     end
   end
 end

data/spec/session/celerity_session_spec.rb

@@ -7,7 +7,7 @@ if RUBY_PLATFORM =~ /java/
     end
 
     describe '#driver' do
-      it "should be a rack test driver" do
+      it "should be a celerity driver" do
         @session.driver.should be_an_instance_of(Capybara::Driver::Celerity)
       end
     end
@@ -21,6 +21,7 @@ if RUBY_PLATFORM =~ /java/
     it_should_behave_like "session"
     it_should_behave_like "session with javascript support"
     it_should_behave_like "session with headers support"
+    it_should_behave_like "session with status code support"
   end
 else
   puts "#{File.basename(__FILE__)} requires JRuby; skipping.."

data/spec/session/culerity_session_spec.rb

@@ -7,7 +7,7 @@ describe Capybara::Session do
     end
 
     describe '#driver' do
-      it "should be a rack test driver" do
+      it "should be a culerity driver" do
         @session.driver.should be_an_instance_of(Capybara::Driver::Culerity)
       end
     end
@@ -21,5 +21,6 @@ describe Capybara::Session do
     it_should_behave_like "session"
     it_should_behave_like "session with javascript support"
     it_should_behave_like "session with headers support"
+    it_should_behave_like "session with status code support"
   end
 end

data/spec/session/rack_test_session_spec.rb

@@ -29,5 +29,6 @@ describe Capybara::Session do
     it_should_behave_like "session"
     it_should_behave_like "session without javascript support"
     it_should_behave_like "session with headers support"
+    it_should_behave_like "session with status code support"
   end
 end

data/spec/session/selenium_session_spec.rb

@@ -21,5 +21,6 @@ describe Capybara::Session do
     it_should_behave_like "session"
     it_should_behave_like "session with javascript support"
     it_should_behave_like "session without headers support"
+    it_should_behave_like "session without status code support"
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +02:00
+date: 2010-07-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 1
         - 16
@@ -48,9 +53,11 @@ dependencies:
   name: culerity
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 2
@@ -62,9 +69,11 @@ dependencies:
   name: selenium-webdriver
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
@@ -76,9 +85,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -90,23 +101,27 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 4
+        version: 0.5.4
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
@@ -118,9 +133,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -128,6 +145,22 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :development
+  version_requirements: *id009
 description: Capybara is an integration testing tool for rack based web applications. It simulates how a user would interact with a website
 email: 
 - jonas.nicklas@gmail.com
@@ -182,6 +215,7 @@ files:
 - lib/capybara/spec/session/headers.rb
 - lib/capybara/spec/session/javascript.rb
 - lib/capybara/spec/session/locate_spec.rb
+- lib/capybara/spec/session/response_code.rb
 - lib/capybara/spec/session/select_spec.rb
 - lib/capybara/spec/session/uncheck_spec.rb
 - lib/capybara/spec/session/unselect_spec.rb
@@ -235,23 +269,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: capybara
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Capybara aims to simplify the process of integration testing Rack applications, such as Rails, Sinatra or Merb