capybara 2.0.0.beta2 → 2.0.0.beta4

data/lib/capybara/node/simple.rb

@@ -126,6 +126,10 @@ module Capybara
         # no op
       end
 
+      def unsynchronized
+        yield # simple nodes don't need to wait
+      end
+
       def all(*args)
         query = Capybara::Query.new(*args)
         elements = native.xpath(query.xpath).map do |node|

data/lib/capybara/query.rb

@@ -11,7 +11,7 @@ module Capybara
         @options[:visible] = Capybara.ignore_hidden_elements
       end
 
-      if args[1]
+      if args[0].is_a?(Symbol)
         @selector = Selector.all[args[0]]
         @locator = args[1]
       else
@@ -35,21 +35,21 @@ module Capybara
     end
 
     def matches_filters?(node)
-      if options[:text]
-        regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text])
-        return false if not node.text.match(regexp)
+      node.unsynchronized do
+        if options[:text]
+          regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text])
+          return false if not node.text.match(regexp)
+        end
+        return false if options[:visible] and not node.visible?
+        selector.custom_filters.each do |name, block|
+          return false if options.has_key?(name) and not block.call(node, options[name])
+        end
+        true
       end
-      return false if options[:visible] and not node.visible?
-      selector.custom_filters.each do |name, block|
-        return false if options.has_key?(name) and not block.call(node, options[name])
-      end
-      true
     end
 
     def matches_count?(count)
       case
-      when count.zero?
-        false
       when options[:between]
         options[:between] === count
       when options[:count]

data/lib/capybara/rack_test/browser.rb

@@ -45,22 +45,18 @@ class Capybara::RackTest::Browser
     new_uri = URI.parse(path)
     method.downcase! unless method.is_a? Symbol
 
-    if new_uri.host
-      @current_host = "#{new_uri.scheme}://#{new_uri.host}"
-      @current_host << ":#{new_uri.port}" if new_uri.port != new_uri.default_port
-    end
+    new_uri.path = request_path if path.start_with?("?")
+    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
+    new_uri.port ||= @current_port unless new_uri.default_port == @current_port
 
-    if new_uri.relative?
-      if path.start_with?('?')
-        path = request_path + path
-      elsif not path.start_with?('/')
-        path = request_path.sub(%r(/[^/]*$), '/') + path
-      end
-      path = current_host + path
-    end
+    @current_scheme = new_uri.scheme
+    @current_host = new_uri.host
+    @current_port = new_uri.port
 
     reset_cache!
-    send(method, path, attributes, env.merge(options[:headers] || {}))
+    send(method, new_uri.to_s, attributes, env.merge(options[:headers] || {}))
   end
 
   def current_url
@@ -70,14 +66,17 @@ class Capybara::RackTest::Browser
   end
 
   def reset_host!
-    @current_host = (Capybara.app_host || Capybara.default_host)
+    uri = URI.parse(Capybara.app_host || Capybara.default_host)
+    @current_scheme = uri.scheme
+    @current_host = uri.host
+    @current_port = uri.port
   end
 
   def reset_cache!
     @dom = nil
   end
 
-  def body
+  def html
     dom.to_xml
   end
 

data/lib/capybara/rack_test/driver.rb

@@ -66,8 +66,8 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     browser.find(selector)
   end
 
-  def body
-    browser.body
+  def html
+    browser.html
   end
 
   def source

data/lib/capybara/rack_test/node.rb

@@ -1,6 +1,6 @@
 class Capybara::RackTest::Node < Capybara::Driver::Node
   def text
-    unnormalized_text.strip.gsub(/\s+/, ' ')
+    Capybara::Helpers.normalize_whitespace(unnormalized_text)
   end
 
   def [](name)
@@ -12,6 +12,9 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
   end
 
   def set(value)
+    if (Array === value) && !self[:multiple]
+      raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
+    end
     if tag_name == 'input' and type == 'radio'
       other_radios_xpath = XPath.generate { |x| x.anywhere(:input)[x.attr(:name).equals(self[:name])] }.to_s
       driver.dom.xpath(other_radios_xpath).each { |node| node.remove_attribute("checked") }
@@ -29,7 +32,17 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
         # Firefox, allowing no input
         value = value[0...self[:maxlength].to_i]
       end
-      native['value'] = value.to_s
+      if Array === value #Assert multiple attribute is present
+        value.each do |v|
+          new_native = native.clone
+          new_native.remove_attribute('value')
+          native.add_next_sibling(new_native)
+          new_native['value'] = v.to_s
+        end
+        native.remove
+      else
+        native['value'] = value.to_s
+      end
     elsif tag_name == "textarea"
       native.content = value.to_s
     end

data/lib/capybara/result.rb

@@ -1,6 +1,9 @@
+require 'forwardable'
+
 module Capybara
   class Result
     include Enumerable
+    extend Forwardable
 
     def initialize(elements, query)
       @elements = elements
@@ -9,31 +12,21 @@ module Capybara
       @query = query
     end
 
-    def each(&block)
-      @result.each(&block)
-    end
-
-    def first
-      @result.first
-    end
+    def_delegators :@result, :each, :[], :at, :size, :count, :length, :first, :last, :empty?
 
     def matches_count?
       @query.matches_count?(@result.size)
     end
 
     def find!
-      raise find_error if @result.count != 1
+      raise find_error if @result.size != 1
       @result.first
     end
 
-    def size; @result.size; end
-    alias_method :length, :size
-    alias_method :count, :size
-
     def find_error
-      if @result.count == 0
+      if @result.size == 0
         Capybara::ElementNotFound.new("Unable to find #{@query.description}")
-      elsif @result.count > 1
+      elsif @result.size > 1
         Capybara::Ambiguous.new("Ambiguous match, found #{size} elements matching #{@query.description}")
       end
     end
@@ -66,11 +59,6 @@ module Capybara
       "expected not to find #{@query.description}, but there #{declension("was", "were")} #{count} #{declension("match", "matches")}"
     end
 
-    def empty?
-      @result.empty?
-    end
-    def [](key); @result[key]; end
-
   private
 
     def declension(singular, plural, count=count)

data/lib/capybara/rspec.rb

@@ -5,10 +5,8 @@ require 'capybara/rspec/matchers'
 require 'capybara/rspec/features'
 
 RSpec.configure do |config|
-  config.include Capybara::DSL, :type => :request
-  config.include Capybara::DSL, :type => :acceptance
-  config.include Capybara::RSpecMatchers, :type => :request
-  config.include Capybara::RSpecMatchers, :type => :acceptance
+  config.include Capybara::DSL, :type => :feature
+  config.include Capybara::RSpecMatchers, :type => :feature
   # 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
@@ -24,3 +22,8 @@ RSpec.configure do |config|
     end
   end
 end
+
+# Override default rack_test driver to respect data-method attributes.
+Capybara.register_driver :rack_test do |app|
+  Capybara::RackTest::Driver.new(app, :respect_data_method => true)
+end

data/lib/capybara/rspec/features.rb

@@ -4,6 +4,9 @@ module Capybara
       base.instance_eval do
         alias :background :before
         alias :scenario :it
+        alias :xscenario :xit
+        alias :given :let
+        alias :given! :let!
       end
     end
   end
@@ -12,7 +15,7 @@ end
 def self.feature(*args, &block)
   options = if args.last.is_a?(Hash) then args.pop else {} end
   options[:capybara_feature] = true
-  options[:type] = :request
+  options[:type] = :feature
   options[:caller] ||= caller
   args.push(options)
 

data/lib/capybara/rspec/matchers.rb

@@ -48,15 +48,15 @@ module Capybara
       end
 
       def failure_message_for_should
-        "expected there to be text #{text.inspect} in #{@actual.text.inspect}"
+        "expected there to be text #{format(text)} in #{format(@actual.text)}"
       end
 
       def failure_message_for_should_not
-        "expected there not to be text #{text.inspect} in #{@actual.text.inspect}"
+        "expected there not to be text #{format(text)} in #{format(@actual.text)}"
       end
 
       def description
-        "have text #{text.inspect}"
+        "have text #{format(text)}"
       end
 
       def wrap(actual)
@@ -66,6 +66,11 @@ module Capybara
           Capybara.string(actual.to_s)
         end
       end
+
+      def format(text)
+        text = Capybara::Helpers.normalize_whitespace(text) unless text.is_a? Regexp
+        text.inspect
+      end
     end
 
     def have_selector(*args)

data/lib/capybara/selector.rb

@@ -72,7 +72,6 @@ end
 
 Capybara.add_selector(:id) do
   xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
-  match { |value| value.is_a?(Symbol) }
 end
 
 Capybara.add_selector(:field) do
@@ -95,7 +94,7 @@ end
 Capybara.add_selector(:link) do
   xpath { |locator| XPath::HTML.link(locator) }
   filter(:href) do |node, href|
-    node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href)])
+    node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href.to_s)])
   end
 end
 

data/lib/capybara/selenium/driver.rb

@@ -38,7 +38,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.page_source
   end
 
-  def body
+  def html
     browser.page_source
   end
 
@@ -113,6 +113,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    [Selenium::WebDriver::Error::ObsoleteElementError, Selenium::WebDriver::Error::UnhandledError]
+    [Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledError]
   end
 end

data/lib/capybara/selenium/node.rb

@@ -1,6 +1,7 @@
 class Capybara::Selenium::Node < Capybara::Driver::Node
   def text
-    native.text
+    # Selenium doesn't normalize Unicode whitespace.
+    Capybara::Helpers.normalize_whitespace(native.text)
   end
 
   def [](name)
@@ -18,12 +19,18 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def set(value)
+    tag_name = self.tag_name
+    type = self[:type]
+    if (Array === value) && !self[:multiple]
+      raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
+    end
     if tag_name == 'input' and type == 'radio'
       click
     elsif tag_name == 'input' and type == 'checkbox'
       click if value ^ native.attribute('checked').to_s.eql?("true")
     elsif tag_name == 'input' and type == 'file'
-      native.send_keys(value.to_s)
+      path_names = value.to_s.empty? ? [] : value
+      native.send_keys(*path_names)
     elsif tag_name == 'textarea' or tag_name == 'input'
       native.send_keys(("\b" * native[:value].size) + value.to_s)
     end
@@ -74,9 +81,4 @@ private
   def select_node
     find('./ancestor::select').first
   end
-
-  def type
-    self[:type]
-  end
-
 end

data/lib/capybara/session.rb

@@ -29,19 +29,18 @@ module Capybara
       :click_link_or_button, :click_button, :click_link, :field_labeled,
       :fill_in, :find, :find_button, :find_by_id, :find_field, :find_link,
       :has_content?, :has_text?, :has_css?, :has_no_content?, :has_no_text?,
-      :has_no_css?, :has_no_xpath?, :resolve,
-      :has_xpath?, :select, :uncheck, :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?, :has_selector?, :has_no_selector?,
-      :click_on, :has_no_checked_field?, :has_no_unchecked_field?, :query,
-      :assert_selector, :assert_no_selector
+      :has_no_css?, :has_no_xpath?, :resolve, :has_xpath?, :select, :uncheck,
+      :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?,
+      :has_selector?, :has_no_selector?, :click_on, :has_no_checked_field?,
+      :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!
+      :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
     ]
     DSL_METHODS = NODE_METHODS + SESSION_METHODS
 
@@ -101,10 +100,10 @@ module Capybara
 
     ##
     #
-    # @return [String] A snapshot of the HTML of the current document, as it looks right now (potentially modified by JavaScript).
+    # @return [String] A snapshot of the DOM of the current document, as it looks right now (potentially modified by JavaScript).
     #
     def html
-      driver.body
+      driver.html
     end
 
     ##
@@ -150,14 +149,22 @@ module Capybara
     #     session.visit('/foo')
     #     session.visit('http://google.com')
     #
-    # For drivers which can run against an external application, such as culerity and selenium
+    # For drivers which can run against an external application, such as the selenium driver
     # giving an absolute URL will navigate to that page. This allows testing applications
-    # running on remote servers. For these drivers, setting Capybara.app_host will make the
+    # running on remote servers. For these drivers, setting {Capybara.app_host} will make the
     # remote server the default. For example:
     #
     #     Capybara.app_host = 'http://google.com'
     #     session.visit('/') # visits the google homepage
     #
+    # If {Capybara.always_include_port} is set to true and this session is running against
+    # a rack application, then the port that the rack application is running on will automatically
+    # be inserted into the URL. Supposing the app is running on port `4567`, doing something like:
+    #
+    #     visit("http://google.com/test")
+    #
+    # Will actually navigate to `http://google.com:4567/test`.
+    #
     # @param [String] url     The URL to navigate to
     #
     def visit(url)
@@ -203,11 +210,7 @@ module Capybara
     # @raise  [Capybara::ElementNotFound]   If the scope can't be found before time expires
     #
     def within(*args)
-      new_scope = if args.size == 1 && Capybara::Node::Base === args.first
-                    args.first
-                  else
-                    find(*args)
-                  end
+      new_scope = if args.first.is_a?(Capybara::Node::Base) then args.first else find(*args) end
       begin
         scopes.push(new_scope)
         yield
@@ -293,16 +296,31 @@ module Capybara
 
     ##
     #
-    # Save a snapshot of the page and open it in a browser for inspection
+    # Save a snapshot of the page.
     #
-    def save_page(file_name=nil)
-      require 'capybara/util/save_and_open_page'
-      Capybara.save_page(body, file_name)
+    # @param  [String] path     The path to where it should be saved [optional]
+    #
+    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
+
+      FileUtils.mkdir_p(File.dirname(path))
+
+      File.open(path,'w') { |f| f.write(body) }
+      path
     end
 
+    ##
+    #
+    # Save a snapshot of the page and open it in a browser for inspection
+    #
+    # @param  [String] path     The path to where it should be saved [optional]
+    #
     def save_and_open_page(file_name=nil)
-      require 'capybara/util/save_and_open_page'
-      Capybara.save_and_open_page(body, file_name)
+      require "launchy"
+      Launchy.open(save_page(file_name))
+    rescue LoadError
+      warn "Please install the launchy gem to open page with save_and_open_page"
     end
 
     ##
@@ -320,12 +338,10 @@ module Capybara
     end
 
     NODE_METHODS.each do |method|
-      class_eval <<-RUBY, __FILE__, __LINE__+1
-        def #{method}(*args, &block)
-          @touched = true
-          current_node.send(:#{method}, *args, &block)
-        end
-      RUBY
+      define_method method do |*args, &block|
+        @touched = true
+        current_node.send(method, *args, &block)
+      end
     end
 
     def inspect