capybara 0.4.1.rc → 0.4.1.1

data/History.txt

@@ -1,6 +1,6 @@
 # Version 0.4.1
 
-Release date:
+Release date: 2011-01-21
 
 ### Added
 
@@ -32,6 +32,8 @@ Release date:
 * Fix problems with multiple file inputs [Philip Arndt]
 * Submit multipart forms as multipart under rack-test even if they contain no files [Ryan Kinderman]
 * Matchers like has_select? and has_checked_field? now work with dynamically changed values [John Firebaugh]
+* Preserve order of rack params [Joel Chippindale]
+* RackTest#reset! is more thorough [Joel Chippindale]
 
 # Version 0.4.0
 

data/lib/capybara.rb

@@ -73,7 +73,7 @@ module Capybara
     #       xpath { |num| ".//tbody/tr[#{num}]" }
     #     end
     #
-    # This makes it possible to use this selector in a cariety of ways:
+    # This makes it possible to use this selector in a variety of ways:
     #
     #     find(:row, 3)
     #     page.find('table#myTable').find(:row, 3).text

data/lib/capybara/driver/rack_test_driver.rb

@@ -123,39 +123,43 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     def params(button)
       params = {}
 
-      native.xpath(".//input[not(@disabled) and (not(@type) or (@type!='radio' and @type!='file' and @type!='checkbox' and @type!='submit' and @type!='image'))]").map do |input|
-        merge_param!(params, input['name'].to_s, input['value'].to_s)
-      end
-      native.xpath(".//textarea[not(@disabled)]").map do |textarea|
-        merge_param!(params, textarea['name'].to_s, textarea.text.to_s)
-      end
-      native.xpath(".//input[not(@disabled) and (@type='radio' or @type='checkbox')]").map do |input|
-        merge_param!(params, input['name'].to_s, input['value'].to_s) if input['checked']
-      end
-      native.xpath(".//select[not(@disabled)]").map do |select|
-        if select['multiple'] == 'multiple'
-          options = select.xpath(".//option[@selected]")
-          options.each do |option|
-            merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s)
-          end
-        else
-          option = select.xpath(".//option[@selected]").first
-          option ||= select.xpath('.//option').first
-          merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s) if option
-        end
-      end
-      native.xpath(".//input[not(@disabled) and @type='file']").map do |input|
-        if multipart?
-          file = \
-            if (value = input['value']).to_s.empty?
-              NilUploadedFile.new
+      native.xpath("(.//input|.//select|.//textarea)[not(@disabled)]").map do |field|
+        case field.name
+        when 'input'
+          if %w(radio checkbox).include? field['type']
+            merge_param!(params, field['name'].to_s, field['value'].to_s) if field['checked']
+          elsif %w(submit image).include? field['type']
+            # TO DO identify the click button here (in document order, rather
+            # than leaving until the end of the params)
+          elsif field['type'] =='file'
+            if multipart?
+              file = \
+                if (value = field['value']).to_s.empty?
+                  NilUploadedFile.new
+                else
+                  content_type = MIME::Types.type_for(value).first.to_s
+                  Rack::Test::UploadedFile.new(value, content_type)
+                end
+              merge_param!(params, field['name'].to_s, file)
             else
-              content_type = MIME::Types.type_for(value).first.to_s
-              Rack::Test::UploadedFile.new(value, content_type)
+              merge_param!(params, field['name'].to_s, File.basename(field['value'].to_s))
             end
-          merge_param!(params, input['name'].to_s, file)
-        else
-          merge_param!(params, input['name'].to_s, File.basename(input['value'].to_s))
+          else
+            merge_param!(params, field['name'].to_s, field['value'].to_s)
+          end
+        when 'select'
+          if field['multiple'] == 'multiple'
+            options = field.xpath(".//option[@selected]")
+            options.each do |option|
+              merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s)
+            end
+          else
+            option = field.xpath(".//option[@selected]").first
+            option ||= field.xpath('.//option').first
+            merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
+          end
+        when 'textarea'
+          merge_param!(params, field['name'].to_s, field.text.to_s)
         end
       end
       merge_param!(params, button[:name], button[:value] || "") if button[:name]
@@ -249,7 +253,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   alias_method :source, :body
 
   def reset!
-    clear_cookies
+    clear_rack_mock_session
   end
 
   def get(*args, &block); reset_cache; super; end
@@ -275,6 +279,13 @@ private
     Rack::MockSession.new(app, Capybara.default_host || "www.example.com")
   end
 
+  # Rack::Test::Methods does not provide methods for manipulating the session
+  # list so these must be manipulated directly.
+  def clear_rack_mock_session
+    @_rack_test_sessions = nil
+    @_rack_mock_sessions = nil
+  end
+
   def request_path
     request.path rescue ""
   end

data/lib/capybara/node/matchers.rb

@@ -201,11 +201,13 @@ module Capybara
       # Checks if the page or current node has a link with the given
       # text or id.
       #
-      # @param [String] locator      The text or id of a link to check for
-      # @return [Boolean]            Whether it exists
+      # @param [String] locator           The text or id of a link to check for
+      # @param options
+      # @option options [String] :href    The value the href attribute must be
+      # @return [Boolean]                 Whether it exists
       #
-      def has_link?(locator)
-        has_xpath?(XPath::HTML.link(locator))
+      def has_link?(locator, options={})
+        has_xpath?(XPath::HTML.link(locator, options))
       end
 
       ##
@@ -213,11 +215,11 @@ module Capybara
       # Checks if the page or current node has no link with the given
       # text or id.
       #
-      # @param [String] locator      The text or id of a link to check for
+      # @param (see Capybara::Node::Finders#has_link?)
       # @return [Boolean]            Whether it doesn't exist
       #
-      def has_no_link?(locator)
-        has_no_xpath?(XPath::HTML.link(locator))
+      def has_no_link?(locator, options={})
+        has_no_xpath?(XPath::HTML.link(locator, options))
       end
 
       ##

data/lib/capybara/spec/session.rb

@@ -75,18 +75,25 @@ shared_examples_for "session" do
     @session.visit('/form')
     @session.fill_in('address1_city', :with =>'Paris')
     @session.fill_in('address1_street', :with =>'CDG')
+    @session.fill_in('address1_street', :with =>'CDG')
+    @session.select("France", :from => 'address1_country')
+
     @session.fill_in('address2_city', :with => 'Mikolaiv')
     @session.fill_in('address2_street', :with => 'PGS')
+    @session.select("Ukraine", :from => 'address2_country')
+
     @session.click_button "awesome"
 
     addresses=extract_results(@session)["addresses"]
     addresses.should have(2).addresses
 
-    addresses[0]["street"].should == 'CDG'
-    addresses[0]["city"].should   == 'Paris'
+    addresses[0]["street"].should   == 'CDG'
+    addresses[0]["city"].should     == 'Paris'
+    addresses[0]["country"].should  == 'France'
 
-    addresses[1]["street"].should == 'PGS'
-    addresses[1]["city"].should   == 'Mikolaiv'
+    addresses[1]["street"].should   == 'PGS'
+    addresses[1]["city"].should     == 'Mikolaiv'
+    addresses[1]["country"].should  == 'Ukraine'
   end
 
 end

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

@@ -8,10 +8,12 @@ shared_examples_for "has_link" do
     it "should be true if the given link is on the page" do
       @session.should have_link('foo')
       @session.should have_link('awesome title')
+      @session.should have_link('A link', :href => '/with_simple_html')
     end
 
     it "should be false if the given link is not on the page" do
       @session.should_not have_link('monkey')
+      @session.should_not have_link('A link', :href => '/non-existant-href')
     end
   end
 
@@ -23,10 +25,12 @@ shared_examples_for "has_link" do
     it "should be false if the given link is on the page" do
       @session.should_not have_no_link('foo')
       @session.should_not have_no_link('awesome title')
+      @session.should_not have_no_link('A link', :href => '/with_simple_html')
     end
 
     it "should be true if the given link is not on the page" do
       @session.should have_no_link('monkey')
+      @session.should have_no_link('A link', :href => '/non-existant-href')
     end
   end
 end

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

@@ -1,8 +1,8 @@
 shared_examples_for "session with headers support" do
   describe '#response_headers' do
     it "should return response headers" do
-      @session.visit('/with_simple_html')     
-      @session.response_headers['Content-Type'].should == 'text/html'
+      @session.visit('/with_simple_html')
+      @session.response_headers['Content-Type'].should =~ %r(text/html)
     end
   end
 end

data/lib/capybara/spec/test_app.rb

@@ -69,6 +69,10 @@ class TestApp < Sinatra::Base
     request.cookies['capybara']
   end
 
+  get '/get_header' do
+    env['HTTP_FOO']
+  end
+
   get '/:view' do |view|
     erb view.to_sym
   end

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

@@ -163,18 +163,30 @@
     <span>First address<span>
     <label for='address1_street'>Street</label>
     <input type="text" name="form[addresses][][street]" value="" id="address1_street">
-  
+
     <label for='address1_city'>City</label>
-    <input type="text" name="form[addresses][][city]" value="" id="address1_city"> 
-  </p>  
+    <input type="text" name="form[addresses][][city]" value="" id="address1_city">
+
+    <label for='address1_country'>Country</label>
+    <select name="form[addresses][][country]" id="address1_country">
+      <option>France</option>
+      <option>Ukraine</option>
+    </select>
+  </p>
 
-  <p>  
+  <p>
     <span>Second address<span>
     <label for='address2_street'>Street</label>
     <input type="text" name="form[addresses][][street]" value="" id="address2_street">
-  
+
     <label for='address2_city'>City</label>
     <input type="text" name="form[addresses][][city]" value="" id="address2_city"> 
+
+    <label for='address2_country'>Country</label>
+    <select name="form[addresses][][country]" id="address2_country">
+      <option>France</option>
+      <option>Ukraine</option>
+    </select>
   </p>
 
   <div style="display:none;">
@@ -207,7 +219,7 @@
 
   <p>
     <label for="form_disabled_radio">
-      Disabled Checkbox
+      Disabled Radio
       <input type="radio" name="form[disabled_radio]" value="Should not see me" id="form_disabled_radio" checked="checked" disabled="disabled" />
     </label>
   </p>

data/lib/capybara/util/save_and_open_page.rb

@@ -21,7 +21,8 @@ module Capybara
       require "launchy"
       Launchy::Browser.run(path)
     rescue LoadError
-      warn "Sorry, you need to install launchy to open pages: `gem install launchy`"
+      warn "Sorry, you need to install launchy (`gem install launchy`) and " <<
+        "make sure it's available to open pages with `save_and_open_page`."
     end
 
     def rewrite_css_and_image_references(response_html) # :nodoc:

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '0.4.1.rc'
+  VERSION = '0.4.1.1'
 end

data/spec/driver/rack_test_driver_spec.rb

@@ -53,4 +53,32 @@ describe Capybara::Driver::RackTest do
   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"
+
+  describe '#reset!' do
+    it { @driver.visit('/foo'); lambda { @driver.reset! }.should change(@driver, :current_url).to('') }
+
+    it 'should reset headers' do
+      @driver.header('FOO', 'BAR')
+      @driver.visit('/get_header')
+      @driver.body.should include('BAR')
+
+      @driver.reset!
+      @driver.visit('/get_header')
+      @driver.body.should_not include('BAR')
+    end
+
+    it 'should reset response' do
+      @driver.visit('/foo')
+      lambda { @driver.response }.should_not raise_error
+      @driver.reset!
+      lambda { @driver.response }.should raise_error
+    end
+
+    it 'should request response' do
+      @driver.visit('/foo')
+      lambda { @driver.request }.should_not raise_error
+      @driver.reset!
+      lambda { @driver.request }.should raise_error
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 0
     - 4
     - 1
-    - rc
-  version: 0.4.1.rc
+    - 1
+  version: 0.4.1.1
 platform: ruby
 authors: 
   - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -125,8 +125,8 @@ dependencies:
             segments: 
               - 0
               - 1
-              - 2
-            version: 0.1.2
+              - 3
+            version: 0.1.3
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
@@ -327,13 +327,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: capybara