capybara 2.1.0 → 2.2.0.rc1

data/lib/capybara/query.rb

@@ -32,6 +32,7 @@ module Capybara
     def description
       @description = "#{label} #{locator.inspect}"
       @description << " with text #{options[:text].inspect}" if options[:text]
+      @description << " with value #{options[:with].inspect}" if options[:with]
       @description
     end
 

data/lib/capybara/rack_test/browser.rb

@@ -46,6 +46,7 @@ class Capybara::RackTest::Browser
     method.downcase! unless method.is_a? Symbol
 
     new_uri.path = request_path if path.start_with?("?")
+    new_uri.path = "/" if new_uri.path.empty?
     new_uri.path = request_path.sub(%r(/[^/]*$), '/') + new_uri.path unless new_uri.path.start_with?('/')
     new_uri.scheme ||= @current_scheme
     new_uri.host ||= @current_host
@@ -77,7 +78,7 @@ class Capybara::RackTest::Browser
   end
 
   def dom
-    @dom ||= Nokogiri::HTML(html)
+    @dom ||= Capybara::HTML(html)
   end
 
   def find(format, selector)
@@ -93,11 +94,11 @@ class Capybara::RackTest::Browser
   rescue Rack::Test::Error
     ""
   end
-  
+
   def title
     dom.xpath("//title").text
   end
-  
+
 protected
 
   def build_rack_mock_session
@@ -108,6 +109,6 @@ protected
   def request_path
     last_request.path
   rescue Rack::Test::Error
-    ""
+    "/"
   end
 end

data/lib/capybara/rack_test/form.rb

@@ -28,7 +28,10 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
       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']
+          if field['checked']
+            node=Capybara::RackTest::Node.new(self.driver, field)
+            merge_param!(params, field['name'].to_s, node.value.to_s)
+          end          
         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)
@@ -60,7 +63,7 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
           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)
+        merge_param!(params, field['name'].to_s, field.text.to_s.gsub(/\n/, "\r\n"))
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]

data/lib/capybara/rack_test/node.rb

@@ -52,7 +52,8 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
       driver.follow(method, self[:href].to_s)
     elsif (tag_name == 'input' and %w(submit image).include?(type)) or
         ((tag_name == 'button') and type.nil? or type == "submit")
-      Capybara::RackTest::Form.new(driver, form).submit(self)
+      associated_form = form
+      Capybara::RackTest::Form.new(driver, associated_form).submit(self) if associated_form
     end
   end
 

data/lib/capybara/result.rb

@@ -29,7 +29,8 @@ module Capybara
       @query = query
     end
 
-    def_delegators :@result, :each, :[], :at, :size, :count, :length, :first, :last, :empty?
+    def_delegators :@result, :each, :[], :at, :size, :count, :length,
+                   :first, :last, :values_at, :empty?, :inspect, :sample, :index
 
     def matches_count?
       Capybara::Helpers.matches_count?(@result.size, @query.options)

data/lib/capybara/rspec.rb

@@ -7,6 +7,12 @@ require 'capybara/rspec/features'
 RSpec.configure do |config|
   config.include Capybara::DSL, :type => :feature
   config.include Capybara::RSpecMatchers, :type => :feature
+
+  # A work-around to support accessing the current example that works in both
+  # RSpec 2 and RSpec 3.
+  fetch_current_example = RSpec.respond_to?(:current_example) ?
+    proc { RSpec.current_example } : proc { |context| context.example }
+
   # The before and after blocks must run instantaneously, because Capybara
   # might not actually be used in all examples where it's included.
   config.after do
@@ -17,6 +23,7 @@ RSpec.configure do |config|
   end
   config.before do
     if self.class.include?(Capybara::DSL)
+      example = fetch_current_example.call(self)
       Capybara.current_driver = Capybara.javascript_driver if example.metadata[:js]
       Capybara.current_driver = example.metadata[:driver] if example.metadata[:driver]
     end

data/lib/capybara/rspec/features.rb

@@ -7,11 +7,13 @@ module Capybara
         alias :xscenario :xit
         alias :given :let
         alias :given! :let!
+        alias :feature :describe
       end
     end
   end
 end
 
+
 def self.feature(*args, &block)
   options = if args.last.is_a?(Hash) then args.pop else {} end
   options[:capybara_feature] = true

data/lib/capybara/rspec/matchers.rb

@@ -126,20 +126,20 @@ module Capybara
       HaveSelector.new(:link, locator, options)
     end
 
-    def have_button(locator)
-      HaveSelector.new(:button, locator)
+    def have_button(locator, options={})
+      HaveSelector.new(:button, locator, options)
     end
 
     def have_field(locator, options={})
       HaveSelector.new(:field, locator, options)
     end
 
-    def have_checked_field(locator)
-      HaveSelector.new(:field, locator, :checked => true)
+    def have_checked_field(locator, options={})
+      HaveSelector.new(:field, locator, options.merge(:checked => true))
     end
 
-    def have_unchecked_field(locator)
-      HaveSelector.new(:field, locator, :unchecked => true)
+    def have_unchecked_field(locator, options={})
+      HaveSelector.new(:field, locator, options.merge(:unchecked => true))
     end
 
     def have_select(locator, options={})

data/lib/capybara/selector.rb

@@ -103,7 +103,7 @@ Capybara.add_selector(:field) do
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
-  filter(:with) { |node, with| node.value == with }
+  filter(:with) { |node, with| node.value == with.to_s }
   filter(:type) do |node, type|
     if ['textarea', 'select'].include?(type)
       node.tag_name == type
@@ -146,6 +146,7 @@ Capybara.add_selector(:radio_button) do
   xpath { |locator| XPath::HTML.radio_button(locator) }
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:option)  { |node, value|  node.value == value.to_s }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 
@@ -153,6 +154,7 @@ Capybara.add_selector(:checkbox) do
   xpath { |locator| XPath::HTML.checkbox(locator) }
   filter(:checked) { |node, value| not(value ^ node.checked?) }
   filter(:unchecked) { |node, value| (value ^ node.checked?) }
+  filter(:option)  { |node, value|  node.value == value.to_s }
   filter(:disabled, :default => false) { |node, value| not(value ^ node.disabled?) }
 end
 

data/lib/capybara/selenium/driver.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     :browser => :firefox
@@ -43,6 +45,14 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.navigate.to(path)
   end
 
+  def go_back
+    browser.navigate.back
+  end
+
+  def go_forward
+    browser.navigate.forward
+  end
+
   def html
     browser.page_source
   end
@@ -87,7 +97,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         # to about:blank, so we rescue this error and do nothing
         # instead.
       end
-      @browser.navigate.to('about:blank')
+      uri = URI(Capybara::EMPTY_HTML_FILE_PATH)
+      uri.scheme = "file"
+      @browser.navigate.to(uri.to_s)
     end
   end
 
@@ -137,7 +149,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def quit
-    @browser.quit
+    @browser.quit if @browser
   rescue Errno::ECONNREFUSED
     # Browser must have already gone
   end

data/lib/capybara/selenium/node.rb

@@ -37,8 +37,21 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       path_names = value.to_s.empty? ? [] : value
       native.send_keys(*path_names)
     elsif tag_name == 'textarea' or tag_name == 'input'
-      #script can change a readonly element which user input cannot, so dont execute if readonly
-      driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
+      if value.to_s.empty?
+        native.clear
+      else
+        #script can change a readonly element which user input cannot, so dont execute if readonly
+        driver.browser.execute_script "arguments[0].value = ''", native unless self[:readonly]
+        native.send_keys(value.to_s)
+      end
+    elsif native.attribute('isContentEditable')
+      #ensure we are focused on the element
+      script = <<-JS
+        var range = document.createRange();
+        range.selectNodeContents(arguments[0]);
+        window.getSelection().addRange(range);
+      JS
+      driver.browser.execute_script script, native
       native.send_keys(value.to_s)
     end
   end
@@ -61,7 +74,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def hover
     driver.browser.action.move_to(native).perform
   end
-  
+
   def drag_to(element)
     driver.browser.action.drag_and_drop(native, element.native).perform
   end
@@ -89,11 +102,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def find_xpath(locator)
     native.find_elements(:xpath, locator).map { |n| self.class.new(driver, n) }
   end
-  
+
   def find_css(locator)
     native.find_elements(:css, locator).map { |n| self.class.new(driver, n) }
   end
-  
+
   def ==(other)
     native == other.native
   end

data/lib/capybara/server.rb

@@ -31,13 +31,13 @@ module Capybara
       end
     end
 
-    attr_reader :app, :port
+    attr_reader :app, :port, :host
 
-    def initialize(app, port=Capybara.server_port)
+    def initialize(app, port=Capybara.server_port, host=Capybara.server_host)
       @app = app
       @middleware = Middleware.new(@app)
       @server_thread = nil # supress warnings
-      @port = port
+      @host, @port = host, port
       @port ||= Capybara::Server.ports[@app.object_id]
       @port ||= find_available_port
     end
@@ -50,10 +50,6 @@ module Capybara
       @middleware.error
     end
 
-    def host
-      Capybara.server_host || "127.0.0.1"
-    end
-
     def responsive?
       return false if @server_thread && @server_thread.join(0)
 

data/lib/capybara/session.rb

@@ -37,10 +37,11 @@ module Capybara
       :has_no_unchecked_field?, :query, :assert_selector, :assert_no_selector
     ]
     SESSION_METHODS = [
-      :body, :html, :current_url, :current_host, :evaluate_script, :source,
-      :visit, :within, :within_fieldset, :within_table, :within_frame,
-      :within_window, :current_path, :save_page, :save_and_open_page,
-      :save_screenshot, :reset_session!, :response_headers, :status_code,
+      :body, :html, :source, :current_url, :current_host, :current_path,
+      :execute_script, :evaluate_script, :visit, :go_back, :go_forward,
+      :within, :within_fieldset, :within_table, :within_frame, :within_window,
+      :save_page, :save_and_open_page, :save_screenshot,
+      :reset_session!, :response_headers, :status_code,
       :title, :has_title?, :has_no_title?, :current_scope
     ]
     DSL_METHODS = NODE_METHODS + SESSION_METHODS
@@ -74,8 +75,11 @@ module Capybara
     # Reset the session, removing all cookies.
     #
     def reset!
-      driver.reset! if @touched
-      @touched = false
+      if @touched
+        driver.reset!
+        @touched = false
+        assert_no_selector :xpath, "/html/body/*"
+      end
       raise @server.error if Capybara.raise_server_errors and @server and @server.error
     ensure
       @server.reset_error! if @server
@@ -195,27 +199,54 @@ module Capybara
 
     ##
     #
-    # Execute the given block for a particular scope on the page. Within will find the first
-    # element matching the given selector and execute the block scoped to that element:
+    # Move back a single entry in the browser's history.
+    #
+    def go_back
+      driver.go_back
+    end
+
+    ##
+    #
+    # Move forward a single entry in the browser's history.
+    #
+    def go_forward
+      driver.go_forward
+    end
+
+    ##
+    #
+    # Executes the given block within the context of a node. `within` takes the
+    # same options as `find`, as well as a block. For the duration of the
+    # block, any command to Capybara will be handled as though it were scoped
+    # to the given element.
     #
     #     within(:xpath, '//div[@id="delivery-address"]') do
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
-    # It is possible to omit the first parameter, in that case, the selector is assumed to be
-    # of the type set in Capybara.default_selector.
+    # Just as with `find`, if multiple elements match the selector given to
+    # `within`, an error will be raised, and just as with `find`, this
+    # behaviour can be controlled through the `:match` and `:exact` options.
+    #
+    # It is possible to omit the first parameter, in that case, the selector is
+    # assumed to be of the type set in Capybara.default_selector.
     #
     #     within('div#delivery-address') do
     #       fill_in('Street', :with => '12 Main Street')
     #     end
     #
+    # Note that a lot of uses of `within` can be replaced more succinctly with
+    # chaining:
+    #
+    #     find('div#delivery-address').fill_in('Street', :with => '12 Main Street')
+    #
     # @overload within(*find_args)
     #   @param (see Capybara::Node::Finders#all)
     #
     # @overload within(a_node)
     #   @param [Capybara::Node::Base] a_node   The node in whose scope the block should be evaluated
     #
-    # @raise  [Capybara::ElementNotFound]   If the scope can't be found before time expires
+    # @raise  [Capybara::ElementNotFound]      If the scope can't be found before time expires
     #
     def within(*args)
       new_scope = if args.first.is_a?(Capybara::Node::Base) then args.first else find(*args) end
@@ -262,9 +293,12 @@ module Capybara
     #   @param [String] name           name of a frame
     #
     def within_frame(frame_handle)
+      scopes.push(nil)
       driver.within_frame(frame_handle) do
         yield
       end
+    ensure
+      scopes.pop
     end
 
     ##
@@ -275,7 +309,10 @@ module Capybara
     # @param [String] handle of the window
     #
     def within_window(handle, &blk)
+      scopes.push(nil)
       driver.within_window(handle, &blk)
+    ensure
+      scopes.pop
     end
 
     ##
@@ -313,7 +350,7 @@ module Capybara
     #
     def save_page(path=nil)
       path ||= "capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}#{rand(10**10)}.html"
-      path = File.expand_path(path, Capybara.save_and_open_page_path) if Capybara.save_and_open_page_path
+      path = File.expand_path(path, Capybara.save_and_open_page_path)
 
       FileUtils.mkdir_p(File.dirname(path))
 
@@ -328,10 +365,15 @@ module Capybara
     # @param  [String] file_name  The path to where it should be saved [optional]
     #
     def save_and_open_page(file_name=nil)
-      require "launchy"
-      Launchy.open(save_page(file_name))
-    rescue LoadError
-      warn "Please install the launchy gem to open page with save_and_open_page"
+      file_name = save_page(file_name)
+
+      begin
+        require "launchy"
+        Launchy.open(file_name)
+      rescue LoadError
+        warn "Page saved to #{file_name} with save_and_open_page."
+        warn "Please install the launchy gem to open page automatically."
+      end
     end
 
     ##
@@ -382,7 +424,7 @@ module Capybara
     end
 
     def current_scope
-      scopes.last
+      scopes.last || document
     end
 
   private

data/lib/capybara/spec/public/test.js

@@ -35,7 +35,7 @@ $(function() {
     $('body').append('<p id="focus_event_triggered">Focus Event triggered</p>');
   });
   $('#with_change_event').change(function() {
-    if($(this).val() == '') $(this).val("Can't be empty");
+    $('body').append($('<p class="change_event_triggered"></p>').text(this.value));
   });
   $('#checkbox_with_event').click(function() {
     $('body').append('<p id="checkbox_event_triggered">Checkbox event triggered</p>');