capybara 0.3.9 → 0.4.0.rc

data/lib/capybara/driver/base.rb

@@ -3,10 +3,6 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
-  def current_path
-    URI.parse(current_url).path
-  end
-
   def visit(path)
     raise NotImplementedError
   end
@@ -15,19 +11,20 @@ class Capybara::Driver::Base
     raise NotImplementedError
   end
 
-  def execute_script(script)
-    raise Capybara::NotSupportedByDriverError
+  def source
+    raise NotImplementedError
   end
 
-  def evaluate_script(script)
-    raise Capybara::NotSupportedByDriverError
+  def body
+    raise NotImplementedError
   end
 
-  def wait?
-    false
+  def execute_script(script)
+    raise Capybara::NotSupportedByDriverError
   end
 
-  def wait_until *args
+  def evaluate_script(script)
+    raise Capybara::NotSupportedByDriverError
   end
 
   def response_headers
@@ -38,19 +35,27 @@ class Capybara::Driver::Base
     raise Capybara::NotSupportedByDriverError
   end
 
-  def body
-    raise NotImplementedError
+  def within_frame(frame_id)
+    raise Capybara::NotSupportedByDriverError
   end
 
-  def within_frame(frame_id)
+  def within_window(handle)
     raise Capybara::NotSupportedByDriverError
   end
 
-  def source
-    raise NotImplementedError
+  def wait?
+    false
+  end
+
+  def wait_until(*args)
+  end
+
+  def reset!
   end
 
   def cleanup!
+    Capybara.deprecate("cleanup!", "reset!")
+    reset!
   end
 
   def has_shortcircuit_timeout?

data/lib/capybara/driver/celerity_driver.rb

@@ -1,96 +1,94 @@
 class Capybara::Driver::Celerity < Capybara::Driver::Base
-  class Node < Capybara::Node
+  class Node < Capybara::Driver::Node
     def text
-      node.text
+      native.text
     end
 
     def [](name)
       value = if name.to_sym == :class
-        node.class_name
+        native.class_name
       else
-        node.send(name.to_sym)
+        native.send(name.to_sym)
       end
       return value if value and not value.to_s.empty?
     end
 
     def value
-      if tag_name == "select" and node.multiple?
-        node.selected_options
+      if tag_name == "select" and native.multiple?
+        native.selected_options
       else
-        super
+        self[:value]
       end
     end
 
     def set(value)
-      node.set(value)
+      native.set(value)
     end
 
-    def select(option)
-      node.select(option)
-    rescue
-      options = all(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
-      raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
+    def select_option
+      native.click
     end
 
-    def unselect(option)
-      unless node.multiple?
-        raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
+    def unselect_option
+      unless select_node.native.multiple?
+        raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
       end
 
       # FIXME: couldn't find a clean way to unselect, so clear and reselect
-      selected_options = node.selected_options
-      if unselect_option  = selected_options.detect { |value| value == option } ||
-                            selected_options.detect { |value| value.index(option) }
-        node.clear
-        (selected_options - [unselect_option]).each { |value| node.select_value(value) }
-      else
-        options = all(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
-      end
+      selected_nodes = select_node.find('.//option[@selected]')
+      select_node.native.clear
+      selected_nodes.each { |n| n.click unless n.path == path }
     end
 
     def click
-      node.click
+      native.click
     end
 
     def drag_to(element)
-      node.fire_event('mousedown')
-      element.node.fire_event('mousemove')
-      element.node.fire_event('mouseup')
+      native.fire_event('mousedown')
+      element.native.fire_event('mousemove')
+      element.native.fire_event('mouseup')
     end
 
     def tag_name
       # FIXME: this might be the dumbest way ever of getting the tag name
       # there has to be something better...
-      node.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1]
+      native.to_xml[/^\s*<([a-z0-9\-\:]+)/, 1]
     end
 
     def visible?
-      node.visible?
+      native.visible?
     end
 
     def path
-      node.xpath
+      native.xpath
     end
 
     def trigger(event)
-      node.fire_event(event.to_s)
+      native.fire_event(event.to_s)
     end
 
-  private
-
-    def all_unfiltered(locator)
-      noko_node = Nokogiri::HTML(driver.body).xpath(node.xpath).first
+    def find(locator)
+      noko_node = Nokogiri::HTML(driver.body).xpath(native.xpath).first
       all_nodes = noko_node.xpath(locator).map { |n| n.path }.join(' | ')
-      driver.find(all_nodes)
+      if all_nodes.empty? then [] else driver.find(all_nodes) end
     end
 
+  protected
+
+    # a reference to the select node if this is an option node
+    def select_node
+      find('./ancestor::select').first
+    end
+
+
   end
 
-  attr_reader :app, :rack_server
+  attr_reader :app, :rack_server, :options
 
-  def initialize(app)
+  def initialize(app, options={})
     @app = app
+    @options = options
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
   end
@@ -143,7 +141,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     @_browser
   end
 
-  def cleanup!
+  def reset!
     browser.clear_cookies
   end
 

data/lib/capybara/driver/culerity_driver.rb

@@ -14,8 +14,9 @@ class Capybara::Driver::Culerity < Capybara::Driver::Celerity
 
   def browser
     unless @_browser
-      @_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, {:browser => :firefox, :log_level => :off}
+      @_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, options
       at_exit do
+        @_browser.close
         @_browser.exit
       end
     end

data/lib/capybara/driver/node.rb

@@ -0,0 +1,66 @@
+module Capybara
+  module Driver
+    class Node
+      attr_reader :driver, :native
+
+      def initialize(driver, native)
+        @driver = driver
+        @native = native
+      end
+
+      def text
+        raise NotImplementedError
+      end
+
+      def [](name)
+        raise NotImplementedError
+      end
+
+      def value
+        raise NotImplementedError
+      end
+
+      def set(value)
+        raise NotImplementedError
+      end
+
+      def select_option
+        raise NotImplementedError
+      end
+
+      def unselect_option
+        raise NotImplementedError
+      end
+
+      def click
+        raise NotImplementedError
+      end
+
+      def drag_to(element)
+        raise NotImplementedError
+      end
+
+      def tag_name
+        raise NotImplementedError
+      end
+
+      def visible?
+        raise NotImplementedError
+      end
+
+      def path
+        raise NotSupportedByDriverError
+      end
+      
+      def trigger(event)
+        raise NotSupportedByDriverError
+      end
+
+      def inspect
+        %(#<Capybara::Driver::Node tag="#{tag_name}" path="#{path}">)
+      rescue NotSupportedByDriverError
+        %(#<Capybara::Driver::Node tag="#{tag_name}">)
+      end
+    end
+  end
+end

data/lib/capybara/driver/rack_test_driver.rb

@@ -1,117 +1,111 @@
 require 'rack/test'
+require 'rack/utils'
 require 'mime/types'
 require 'nokogiri'
 require 'cgi'
 
 class Capybara::Driver::RackTest < Capybara::Driver::Base
-  class Node < Capybara::Node
+  class Node < Capybara::Driver::Node
     def text
-      node.text
+      native.text
     end
 
     def [](name)
       attr_name = name.to_s
       case
       when 'select' == tag_name && 'value' == attr_name
-        if node['multiple'] == 'multiple'
-          node.xpath(".//option[@selected='selected']").map { |option| option.content  }
+        if native['multiple'] == 'multiple'
+          native.xpath(".//option[@selected='selected']").map { |option| option[:value] || option.content  }
         else
-          option = node.xpath(".//option[@selected='selected']").first || node.xpath(".//option").first
-          option.content if option
+          option = native.xpath(".//option[@selected='selected']").first || native.xpath(".//option").first
+          option[:value] || option.content if option
         end
       when 'input' == tag_name && 'checkbox' == type && 'checked' == attr_name
-        node[attr_name] == 'checked' ? true : false
+        native[attr_name] == 'checked' ? true : false
       else
-        node[attr_name]
+        native[attr_name]
       end
     end
 
     def value
       if tag_name == 'textarea'
-        node.content
+        native.content
       else
-        super
+        self[:value]
       end
     end
 
     def set(value)
       if tag_name == 'input' and type == 'radio'
-        driver.html.xpath("//input[@name=#{Capybara::XPath.escape(self[:name])}]").each { |node| node.remove_attribute("checked") }
-        node['checked'] = 'checked'
+        other_radios_xpath = XPath.generate { |x| x.anywhere(:input)[x.attr(:name).equals(self[:name])] }.to_s
+        driver.html.xpath(other_radios_xpath).each { |node| node.remove_attribute("checked") }
+        native['checked'] = 'checked'
       elsif tag_name == 'input' and type == 'checkbox'
-        if value && !node['checked']
-          node['checked'] = 'checked'
-        elsif !value && node['checked']
-          node.remove_attribute('checked')
+        if value && !native['checked']
+          native['checked'] = 'checked'
+        elsif !value && native['checked']
+          native.remove_attribute('checked')
         end
       elsif tag_name == 'input'
-        node['value'] = value.to_s
+        native['value'] = value.to_s
       elsif tag_name == "textarea"
-        node.content = value.to_s
+        native.content = value.to_s
       end
     end
 
-    def select(option)
-      if node['multiple'] != 'multiple'
-        node.xpath(".//option[@selected]").each { |node| node.remove_attribute("selected") }
-      end
-
-      if option_node = node.xpath(".//option[text()=#{Capybara::XPath.escape(option)}]").first ||
-                       node.xpath(".//option[contains(.,#{Capybara::XPath.escape(option)})]").first
-        option_node["selected"] = 'selected'
-      else
-        options = node.xpath(".//option").map { |o| "'#{o.text}'" }.join(', ')
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
+    def select_option
+      if select_node['multiple'] != 'multiple'
+        select_node.find(".//option[@selected]").each { |node| node.native.remove_attribute("selected") }
       end
+      native["selected"] = 'selected'
     end
 
-    def unselect(option)
-      if node['multiple'] != 'multiple'
-        raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
-      end
-
-      if option_node = node.xpath(".//option[text()=#{Capybara::XPath.escape(option)}]").first ||
-                       node.xpath(".//option[contains(.,#{Capybara::XPath.escape(option)})]").first
-        option_node.remove_attribute('selected')
-      else
-        options = node.xpath(".//option").map { |o| "'#{o.text}'" }.join(', ')
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
+    def unselect_option
+      if select_node['multiple'] != 'multiple'
+        raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
       end
+      native.remove_attribute('selected')
     end
 
     def click
       if tag_name == 'a'
         method = self["data-method"] || :get
         driver.process(method, self[:href].to_s)
-      elsif (tag_name == 'input' or tag_name == 'button') and %w(submit image).include?(type)
+      elsif (tag_name == 'input' and %w(submit image).include?(type)) or
+          ((tag_name == 'button') and type.nil? or type == "submit")
         Form.new(driver, form).submit(self)
       end
     end
 
     def tag_name
-      node.node_name
+      native.node_name
     end
 
     def visible?
-      node.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none')]").size == 0
+      native.xpath("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none')]").size == 0
     end
 
     def path
-      node.path
+      native.path
+    end
+
+    def find(locator)
+      native.xpath(locator).map { |n| self.class.new(driver, n) }
     end
 
   private
 
-    def all_unfiltered(locator)
-      node.xpath(locator).map { |n| self.class.new(driver, n) }
+    # a reference to the select node if this is an option node
+    def select_node
+      find('./ancestor::select').first
     end
 
     def type
-      node[:type]
+      native[:type]
     end
 
     def form
-      node.ancestors('form').first
+      native.ancestors('form').first
     end
   end
 
@@ -119,16 +113,16 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     def params(button)
       params = {}
 
-      node.xpath(".//input[not(@type) or (@type!='radio' and @type!='checkbox' and @type!='submit' and @type!='image')]").map do |input|
+      native.xpath(".//input[not(@disabled) and (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|
+      native.xpath(".//textarea[not(@disabled)]").map do |textarea|
         merge_param!(params, textarea['name'].to_s, textarea.text.to_s)
       end
-      node.xpath(".//input[@type='radio' or @type='checkbox']").map do |input|
+      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
-      node.xpath(".//select").map do |select|
+      native.xpath(".//select[not(@disabled)]").map do |select|
         if select['multiple'] == 'multiple'
           options = select.xpath(".//option[@selected]")
           options.each do |option|
@@ -140,7 +134,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
           merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s) if option
         end
       end
-      node.xpath(".//input[@type='file']").map do |input|
+      native.xpath(".//input[not(@disabled) and @type='file']").map do |input|
         unless input['value'].to_s.empty?
           if multipart?
             content_type = MIME::Types.type_for(input['value'].to_s).first.to_s
@@ -156,7 +150,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     end
 
     def submit(button)
-      driver.submit(method, node['action'].to_s, params(button))
+      driver.submit(method, native['action'].to_s, params(button))
     end
 
     def multipart?
@@ -170,16 +164,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     end
 
     def merge_param!(params, key, value)
-      collection = key.sub!(/\[\]$/, '')
-      if collection
-        if params[key]
-          params[key] << value
-        else
-          params[key] = [value]
-        end
-      else
-        params[key] = value
-      end
+      Rack::Utils.normalize_params(params, key, value)
     end
   end
 
@@ -200,7 +185,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
 
   def process(method, path, attributes = {})
     return if path.gsub(/^#{request_path}/, '') =~ /^#/
-    send(method, path, attributes, env)
+    send(method, to_binary(path), to_binary( attributes ), env)
     follow_redirects!
   end
 
@@ -216,9 +201,23 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     response.status
   end
 
+  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
+  end
+
   def submit(method, path, attributes)
     path = request_path if not path or path.empty?
-    send(method, path, attributes, env)
+    send(method, to_binary(path), to_binary(attributes), env)
     follow_redirects!
   end
 
@@ -235,7 +234,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   end
   alias_method :source, :body
 
-  def cleanup!
+  def reset!
     clear_cookies
   end