capybara 1.0.0.beta1 → 1.0.0.rc1

data/README.rdoc

@@ -26,12 +26,12 @@ On OSX you may have to install libffi, you can install it via MacPorts with:
 == Development:
 
 * Source hosted at {GitHub}[http://github.com/jnicklas/capybara].
-* Please direct questions, discussions at the {mailing list}[http://groups.google.com/group/ruby-capybara].
-* Report issues on {GitHub Issues}[http://github.com/jnicklas/capybara/issues]
+* Please direct questions, discussion or problems to the {mailing list}[http://groups.google.com/group/ruby-capybara].
+* If you found a reproducible bug, open a {GitHub Issue}[http://github.com/jnicklas/capybara/issues] to submit a bug report.
 
-Pull requests are very welcome! Make sure your patches are well tested, Capybara is
-a testing tool after all. Please create a topic branch for every separate change
-you make.
+Pull requests are very welcome (and even better than bug reports)! Make sure
+your patches are well tested, Capybara is a testing tool after all. Please
+create a topic branch for every separate change you make.
 
 Capybara uses bundler in development. To set up a development environment, simply do:
 
@@ -88,7 +88,7 @@ by adding the following line (typically to your <tt>spec_helper.rb</tt> file):
 
     require 'capybara/rspec'
 
-You can now use it in your examples:
+You can now write your specs like so:
 
     describe "the signup process", :type => :request do
       before :each do
@@ -104,16 +104,21 @@ You can now use it in your examples:
       end
     end
 
-Capybara is only included for examples with <tt>:type => :request</tt> (or
-<tt>:acceptance</tt> for compatibility).
+Capybara is only included in example groups tagged with
+<tt>:type => :request</tt> (or <tt>:acceptance</tt> for compatibility with Steak).
 
-If you use the <tt>rspec-rails</tt> gem, <tt>:type => :request</tt> is
-automatically set on all files under <tt>spec/requests</tt>. Essentially, these
-are Capybara-enhanced Rails request specs, so it's a good idea to place your
-Capybara specs here because within request specs you gain a few additional
-features, such as the ability to refer to named route helpers. If you do not
-need these, then you may simply use <tt>spec/acceptance</tt> and you will still
-get access to Capybara methods.
+If you are testing a Rails app and using the <tt>rspec-rails</tt> gem, these
+<tt>:request</tt> example groups may look familiar to you. That's because they
+are RSpec versions of Rails integration tests. So, in this case essentially what you are getting are Capybara-enhanced request specs. This means that you can
+use the Capybara helpers <i>and</i> you have access to things like named route
+helpers in your tests (so you are able to say, for instance, <tt>visit
+edit_user_path(user)</tt>, instead of <tt>visit "/users/#{user.id}/edit"</tt>,
+if you prefer that sort of thing). A good place to put these specs is
+<tt>spec/requests</tt>, as <tt>rspec-rails</tt> will automatically tag them with
+<tt>:type => :request</tt>. (In fact, <tt>spec/integration</tt> and
+<tt>spec/acceptance</tt> will work just as well.)
+
+<tt>rspec-rails</tt> will also automatically include Capybara in <tt>:controller</tt> and <tt>:mailer</tt> example groups.
 
 RSpec's metadata feature can be used to switch to a different driver. Use
 <tt>:js => true</tt> to switch to the javascript driver, or provide a
@@ -124,7 +129,7 @@ RSpec's metadata feature can be used to switch to a different driver. Use
       it 'will switch to one specific driver', :driver => :celerity
     end
 
-Capybara also comes with a built in DSL for creating descriptive acceptance tests:
+Finally, Capybara also comes with a built in DSL for creating descriptive acceptance tests:
 
     feature "Signing up" do
       background do
@@ -140,11 +145,10 @@ Capybara also comes with a built in DSL for creating descriptive acceptance test
       end
     end
 
-Essentially, this is just a shortcut for making a request spec, where
-<tt>feature</tt> is a shortcut for <tt>describe ..., :type => :request</tt>,
-<tt>background</tt> is an alias for <tt>before :each</tt>, and <tt>scenario</tt>
-is an alias for <tt>it</tt>/<tt>example</tt>. Again, you are encouraged to place
-these within <tt>spec/requests</tt> rather than <tt>spec/acceptance</tt>.
+This is, in fact, just a shortcut for making a request spec, where
+<tt>feature</tt> is an alias for <tt>describe ..., :type => :request</tt>,
+<tt>background</tt> is an alias for <tt>before</tt>, and <tt>scenario</tt>
+is an alias for <tt>it</tt>/<tt>specify</tt>.
 
 Note that Capybara's built in RSpec support only works with RSpec 2.0 or later.
 You'll need to roll your own for earlier versions of RSpec.
@@ -407,6 +411,9 @@ method. Optionally you can specify which kind of selector to use.
       fill_in 'Name', :with => 'Jimmy'
     end
 
+Note that <tt>within</tt> will scope the actions to the _first_ (not _any_)
+element that matches the selector.
+
 There are special methods for restricting the scope to a specific fieldset,
 identified by either an id or the text of the fieldet's legend tag, and to a
 specific table, identified by either id or text of the table's caption tag.

data/lib/capybara.rb

@@ -83,7 +83,7 @@ module Capybara
     #     within(:row, 3) { page.should have_content('$100.000') }
     #
     # It might be convenient to specify that the selector is automatically chosen for certain
-    # values. This way you don't have to explicitely specify that you are looking for a row, or
+    # values. This way you don't have to explicitly specify that you are looking for a row, or
     # an id. Let's say we want Capybara to treat any Symbols sent into methods like find to be
     # treated as though they were element ids. We could achieve this like so:
     #

data/lib/capybara/rack_test/browser.rb

@@ -35,15 +35,22 @@ class Capybara::RackTest::Browser
     new_uri = URI.parse(path)
     current_uri = URI.parse(current_url)
 
-    path = request_path + path if path.start_with?('?')
-    path = current_host + path if path.start_with?('/')
-
     if new_uri.host
       @current_host = new_uri.scheme + '://' + new_uri.host
     end
-
+    
+    if new_uri.relative?
+      path = request_path + path if path.start_with?('?')
+      
+      unless path.start_with?('/')
+        folders = request_path.split('/')
+        path = (folders[0, folders.size - 1] << path).join('/')
+      end
+      path = current_host + path
+    end
+    
     reset_cache!
-    send(method, to_binary(path), to_binary( attributes ), env)
+    send(method, path, attributes, env)
     follow_redirects!
   end
 
@@ -81,18 +88,9 @@ class Capybara::RackTest::Browser
 
 protected
 
-  def to_binary(object)
-    return object unless Kernel.const_defined?(:Encoding)
-
-    if object.respond_to?(:force_encoding)
-      object.dup.force_encoding(Encoding::ASCII_8BIT)
-    elsif object.respond_to?(:each_pair) #Hash
-      {}.tap { |x| object.each_pair {|k,v| x[to_binary(k)] = to_binary(v) } }
-    elsif object.respond_to?(:each) #Array
-      object.map{|x| to_binary(x)}
-    else
-      object
-    end
+  def build_rack_mock_session
+    reset_host! unless current_host
+    Rack::MockSession.new(app, URI.parse(current_host).host)
   end
 
   def request_path

data/lib/capybara/rspec/matchers.rb

@@ -27,6 +27,10 @@ module Capybara
         "expected #{selector_name} not to return anything"
       end
 
+      def description
+        "has #{selector_name}"
+      end
+
       def selector_name
         name = "#{normalized.name} #{normalized.locator.inspect}"
         name << " with text #{normalized.options[:text].inspect}" if normalized.options[:text]
@@ -82,6 +86,10 @@ module Capybara
         "expected #{selector_name} not to return anything"
       end
 
+      def description
+        "has #{selector_name}"
+      end
+
       def selector_name
         selector_name = "#{name} #{locator.inspect}"
         selector_name << " with text #{options[:text].inspect}" if options[:text]

data/lib/capybara/selenium/driver.rb

@@ -13,8 +13,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   def browser
     unless @browser
       @browser = Selenium::WebDriver.for(options[:browser], options.reject { |key,val| SPECIAL_OPTIONS.include?(key) })
+
+      main = Process.pid
       at_exit do
-        @browser.quit
+        quit if Process.pid == main
       end
     end
     @browser
@@ -110,6 +112,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.switch_to.window(handle, &blk)
   end
 
+  def quit
+    @browser.quit
+  rescue Errno::ECONNREFUSED
+    # Browser must have already gone
+  end
+
 private
 
   def load_wait_for_ajax_support

data/lib/capybara/selenium/node.rb

@@ -4,20 +4,16 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def [](name)
-    if name == :value
-      value
-    else
-      native.attribute(name.to_s)
-    end
+    native.attribute(name.to_s)
   rescue Selenium::WebDriver::Error::WebDriverError
     nil
   end
 
   def value
     if tag_name == "select" and self[:multiple] and not self[:multiple] == "false"
-      native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n.value || n.text }
+      native.find_elements(:xpath, ".//option").select { |n| n.selected? }.map { |n| n[:value] || n.text }
     else
-      native.value
+      native[:value]
     end
   end
 
@@ -54,7 +50,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def tag_name
-    native.tag_name
+    native.tag_name.downcase
   end
 
   def visible?

data/lib/capybara/server.rb

@@ -12,7 +12,7 @@ module Capybara
 
       def call(env)
         if env["PATH_INFO"] == "/__identify__"
-          [200, {}, @app.object_id.to_s]
+          [200, {}, [@app.object_id.to_s]]
         else
           @app.call(env)
         end

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

@@ -12,6 +12,22 @@ shared_examples_for "click_button" do
       end
     end
 
+    context "with a form that has a relative url as an action" do
+      it "should post to the correct url" do
+        @session.click_button('Relative Action')
+        @session.current_path.should == '/relative'
+        extract_results(@session)['relative'].should == 'Relative Action'
+      end
+    end
+
+    context "with a form that has no action specified" do
+      it "should post to the correct url" do
+        @session.click_button('No Action')
+        @session.current_path.should == '/form'
+        extract_results(@session)['no_action'].should == 'No Action'
+      end
+    end
+    
     context "with value given on a submit button" do
       context "on a form with HTML5 fields" do
         before do
@@ -284,4 +300,5 @@ shared_examples_for "click_button" do
       @session.body.should include('Postback')
     end
   end
+
 end

data/lib/capybara/spec/test_app.rb

@@ -47,6 +47,10 @@ class TestApp < Sinatra::Base
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end
 
+  post '/relative' do
+    '<pre id="results">' + params[:form].to_yaml + '</pre>'
+  end
+
   get '/favicon.ico' do
     nil
   end

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

@@ -351,3 +351,15 @@
     <input type="submit" name="form[button]" value="Just a button"/>
   </p>
 </form>
+
+<form action="relative" method="post">
+  <p>
+    <input type="submit" name="form[relative]" value="Relative Action" />
+  </p>
+</form>
+
+<form method="post">
+  <p>
+    <input type="submit" name="form[no_action]" value="No Action" />
+  </p>
+</form>

data/lib/capybara/version.rb

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

data/spec/driver/rack_test_driver_spec.rb

@@ -25,29 +25,6 @@ describe Capybara::RackTest::Driver do
     end.should raise_error(ArgumentError)
   end
 
-  if '1.9'.respond_to?(:encode)
-    describe "with non-binary parameters" do
-
-      it "should convert attribute values to binary" do
-        output = capture(:stderr) {
-          @driver.visit('/mypage', :param => 'µ')
-        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
-      end
-
-      it "should convert attribute with Array to binary" do
-        output = capture(:stderr) {
-          @driver.visit('/mypage', :param => ['µ'])
-        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
-      end
-
-      it "should convert path to binary" do
-        output = capture(:stderr) {
-          @driver.visit('/mypage'.encode('utf-8'))
-        }.should_not =~ %r{warning: regexp match /.../n against to UTF-8 string}
-      end
-    end
-  end
-
   it_should_behave_like "driver"
   it_should_behave_like "driver with header support"
   it_should_behave_like "driver with status code support"

data/spec/driver/selenium_driver_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rbconfig'
 
 describe Capybara::Selenium::Driver do
   before do
@@ -12,4 +13,17 @@ describe Capybara::Selenium::Driver do
   it_should_behave_like "driver with support for window switching"
   it_should_behave_like "driver without status code support"
   it_should_behave_like "driver with cookies support"
+
+  unless Config::CONFIG['host_os'] =~ /mswin|mingw/
+    it "should not interfere with forking child processes" do
+      # Launch a browser, which registers the at_exit hook
+      browser = Capybara::Selenium::Driver.new(TestApp).browser
+
+      # Fork an unrelated child process. This should not run the code in the at_exit hook.
+      pid = fork { "child" }
+      Process.wait2(pid)[1].exitstatus.should == 0
+
+      browser.quit
+    end
+  end
 end

data/spec/rspec/matchers_spec.rb

@@ -9,6 +9,10 @@ describe Capybara::RSpecMatchers do
   include Capybara::RSpecMatchers
 
   describe "have_css matcher" do
+    it "gives proper description" do
+      have_css('h1').description.should == "has css \"h1\""
+    end
+
     context "on a string" do
       context "with should" do
         it "passes if has_css? returns true" do
@@ -87,6 +91,10 @@ describe Capybara::RSpecMatchers do
   end
 
   describe "have_xpath matcher" do
+    it "gives proper description" do
+      have_xpath('//h1').description.should == "has xpath \"\/\/h1\""
+    end
+
     context "on a string" do
       context "with should" do
         it "passes if has_css? returns true" do
@@ -145,6 +153,10 @@ describe Capybara::RSpecMatchers do
   end
 
   describe "have_selector matcher" do
+    it "gives proper description" do
+      have_selector('//h1').description.should == "has xpath \"//h1\""
+    end
+
     context "on a string" do
       context "with should" do
         it "passes if has_css? returns true" do
@@ -229,6 +241,10 @@ describe Capybara::RSpecMatchers do
   end
 
   describe "have_content matcher" do
+    it "gives proper description" do
+      have_content('Text').description.should == "has content \"Text\""
+    end
+
     context "on a string" do
       context "with should" do
         it "passes if has_css? returns true" do
@@ -299,6 +315,10 @@ describe Capybara::RSpecMatchers do
   describe "have_link matcher" do
     let(:html) { '<a href="#">Just a link</a>' }
 
+    it "gives proper description" do
+      have_link('Just a link').description.should == "has link \"Just a link\""
+    end
+
     it "passes if there is such a button" do
       html.should have_link('Just a link')
     end
@@ -313,6 +333,10 @@ describe Capybara::RSpecMatchers do
   describe "have_button matcher" do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
+    it "gives proper description" do
+      have_button('A button').description.should == "has button \"A button\""
+    end
+
     it "passes if there is such a button" do
       html.should have_button('A button')
     end
@@ -327,6 +351,10 @@ describe Capybara::RSpecMatchers do
   describe "have_field matcher" do
     let(:html) { '<p><label>Text field<input type="text"/></label></p>' }
 
+    it "gives proper description" do
+      have_field('Text field').description.should == "has field \"Text field\""
+    end
+
     it "passes if there is such a field" do
       html.should have_field('Text field')
     end
@@ -344,6 +372,10 @@ describe Capybara::RSpecMatchers do
       <label>unchecked field<input type="checkbox"/></label>'
     end
 
+    it "gives proper description" do
+      have_checked_field('it is checked').description.should == "has checked_field \"it is checked\""
+    end
+
     context "with should" do
       it "passes if there is such a field and it is checked" do
         html.should have_checked_field('it is checked')
@@ -385,6 +417,10 @@ describe Capybara::RSpecMatchers do
       <label>unchecked field<input type="checkbox"/></label>'
     end
 
+    it "gives proper description" do
+      have_unchecked_field('unchecked field').description.should == "has unchecked_field \"unchecked field\""
+    end
+
     context "with should" do
       it "passes if there is such a field and it is not checked" do
         html.should have_unchecked_field('unchecked field')
@@ -423,6 +459,10 @@ describe Capybara::RSpecMatchers do
   describe "have_select matcher" do
     let(:html) { '<label>Select Box<select></select></label>' }
 
+    it "gives proper description" do
+      have_select('Select Box').description.should == "has select \"Select Box\""
+    end
+
     it "passes if there is such a select" do
       html.should have_select('Select Box')
     end
@@ -437,6 +477,10 @@ describe Capybara::RSpecMatchers do
   describe "have_table matcher" do
     let(:html) { '<table><caption>Lovely table</caption></table>' }
 
+    it "gives proper description" do
+      have_table('Lovely table').description.should == "has table \"Lovely table\""
+    end
+
     it "passes if there is such a select" do
       html.should have_table('Lovely table')
     end

data/spec/spec_helper.rb

@@ -5,6 +5,15 @@ require "bundler/setup"
 
 require 'rspec'
 require 'capybara'
+
+RSpec.configure do |config|
+  config.before do
+    Capybara.configure do |config|
+      config.default_selector = :xpath
+    end
+  end
+end
+
 require 'capybara/spec/driver'
 require 'capybara/spec/session'
 
@@ -15,12 +24,4 @@ Capybara.default_wait_time = 0 # less timeout so tests run faster
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
   Selenium = Capybara::Session.new(:selenium, TestApp)
-end
-
-RSpec.configure do |config|
-  config.before do
-    Capybara.configure do |config|
-      config.default_selector = :xpath
-    end
-  end
-end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +02:00
+date: 2011-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,13 +53,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 2
         - 0
-        - 27
-        version: 0.0.27
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency