capybara 0.2.0 → 0.3.0

data/lib/capybara/cucumber.rb

@@ -15,6 +15,10 @@ Before('@selenium') do
   Capybara.current_driver = :selenium
 end
 
+Before('@celerity') do
+  Capybara.current_driver = :celerity
+end
+
 Before('@culerity') do
   Capybara.current_driver = :culerity
 end

data/lib/capybara/driver/base.rb

@@ -1,17 +1,34 @@
 class Capybara::Driver::Base
+  def current_url
+    raise NotImplementedError
+  end
+
   def visit(path)
-    raise "Not implemented"
+    raise NotImplementedError
   end
-  
+
   def find(query)
-    raise "Not implemented"
+    raise NotImplementedError
   end
-  
-  def body
-    raise "Not implemented"
+
+  def evaluate_script(script)
+    raise Capybara::NotSupportedByDriverError
   end
-  
+
   def wait?
     false
   end
-end
+
+  def response_headers
+    raise Capybara::NotSupportedByDriverError
+  end
+
+  def body
+    raise NotImplementedError
+  end
+
+  def source
+    raise NotImplementedError
+  end
+
+end

data/lib/capybara/driver/celerity_driver.rb

@@ -0,0 +1,108 @@
+class Capybara::Driver::Celerity < Capybara::Driver::Base
+  class Node < Capybara::Node
+    def text
+      node.text
+    end
+
+    def [](name)
+      value = if name.to_sym == :class
+        node.class_name
+      else
+        node.send(name.to_sym)
+      end
+      return value if value and not value.empty?
+    end
+
+    def set(value)
+      node.set(value)
+    end
+
+    def select(option)
+      node.select(option)
+    end
+
+    def click
+      node.click
+    end
+
+    def drag_to(element)
+      node.fire_event('mousedown')
+      element.node.fire_event('mousemove')
+      element.node.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]
+    end
+
+    def visible?
+      node.visible?
+    end
+
+    def path
+      node.xpath
+    end
+
+  end
+
+  attr_reader :app, :rack_server
+
+  def initialize(app)
+    @app = app
+    unless Capybara.app_host
+      @rack_server = Capybara::Server.new(@app)
+    end
+  end
+
+  def visit(path)
+    browser.goto(url(path))
+  end
+
+  def current_url
+    browser.url
+  end
+  
+  def source
+    browser.html
+  end
+
+  def body
+    browser.document.as_xml
+  end
+
+  def response_headers
+    browser.response_headers
+  end
+
+  def find(selector)
+    browser.elements_by_xpath(selector).map { |node| Node.new(self, node) }
+  end
+
+  def wait?; true; end
+
+  def evaluate_script(script)
+    browser.execute_script "#{script}"
+  end
+
+  def browser
+    unless @_browser
+      require 'celerity'
+      @_browser = ::Celerity::Browser.new(:browser => :firefox, :log_level => :off)
+    end
+
+    @_browser
+  end
+
+private
+
+  def url(path)
+    if rack_server
+      rack_server.url(path)
+    else
+      Capybara.app_host.to_s + path
+    end
+  end
+
+end

data/lib/capybara/driver/culerity_driver.rb

@@ -1,46 +1,6 @@
 require 'culerity'
 
-class Capybara::Driver::Culerity < Capybara::Driver::Base
-  class Node < Capybara::Node
-    def text
-      node.text
-    end
-
-    def [](name)
-      value = if name.to_sym == :class
-        node.class_name
-      else
-        node.send(name.to_sym)
-      end
-      return value if value and not value.empty?
-    end
-
-    def set(value)
-      node.set(value)
-    end
-
-    def select(option)
-      node.select(option)
-    end
-
-    def click
-      node.click
-    end
-
-    def drag_to(element)
-      node.fire_event('mousedown')
-      element.node.fire_event('mousemove')
-      element.node.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]
-    end
-  end
-
-  attr_reader :app, :rack_server
+class Capybara::Driver::Culerity < Capybara::Driver::Celerity
 
   def self.server
     unless @_server
@@ -52,35 +12,6 @@ class Capybara::Driver::Culerity < Capybara::Driver::Base
     @_server
   end
 
-  def initialize(app)
-    @app = app
-    @rack_server = Capybara::Server.new(@app)
-  end
-
-  def visit(path)
-    browser.goto(url(path))
-  end
-
-  def body
-    browser.html
-  end
-
-  def find(selector)
-    browser.elements_by_xpath(selector).map { |node| Node.new(self, node) }
-  end
-  
-  def wait?; true; end
-
-  def evaluate_script(script)
-    browser.execute_script "#{script}"
-  end
-
-private
-
-  def url(path)
-    rack_server.url(path)
-  end
-
   def browser
     unless @_browser
       @_browser = ::Culerity::RemoteBrowserProxy.new self.class.server, {:browser => :firefox, :log_level => :off}

data/lib/capybara/driver/rack_test_driver.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'mime/types'
 require 'nokogiri'
 require 'cgi'
 
@@ -7,7 +8,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     def text
       node.text
     end
-    
+
     def [](name)
       value = node[name.to_s]
       return value.to_s if value
@@ -29,7 +30,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
         node.content = value.to_s
       end
     end
-    
+
     def select(option)
       node.xpath(".//option").each { |node| node.remove_attribute("selected") }
       node.xpath(".//option[contains(.,'#{option}')]").first["selected"] = 'selected'
@@ -37,18 +38,26 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
 
     def click
       if tag_name == 'a'
-        driver.visit(self[:href])
+        driver.visit(self[:href].to_s)
       elsif (tag_name == 'input' or tag_name == 'button') and %w(submit image).include?(type)
         Form.new(driver, form).submit(self)
       end
     end
-    
+
     def tag_name
       node.node_name
     end
 
+    def visible?
+      node.xpath("./ancestor-or-self::*[contains(@style, 'display:none')]").size == 0
+    end
+
+    def path
+      node.path
+    end
+
   private
-  
+
     def type
       self[:type]
     end
@@ -76,9 +85,11 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
         merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s) if option
       end
       node.xpath(".//input[@type='file']").map do |input|
-        if input['value'].to_s.any?
+        unless input['value'].to_s.empty?
           if multipart?
-            merge_param!(params, input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s))
+            content_type = MIME::Types.type_for(input['value'].to_s).first.to_s
+            file = Rack::Test::UploadedFile.new(input['value'].to_s, content_type)
+            merge_param!(params, input['name'].to_s, file)
           else
             merge_param!(params, input['name'].to_s, File.basename(input['value'].to_s))
           end
@@ -89,23 +100,19 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     end
 
     def submit(button)
-      if post?
-        driver.submit(node['action'].to_s, params(button))
-      else
-        driver.visit(node['action'].to_s, params(button))
-      end
+      driver.submit(method, node['action'].to_s, params(button))
     end
 
     def multipart?
       self[:enctype] == "multipart/form-data"
     end
+
+  private
     
-    def post?
-      self[:method] =~ /post/i
+    def method
+      self[:method] =~ /post/i ? :post : :get
     end
-    
-    private
-    
+
     def merge_param!(params, key, value)
       collection = key.sub!(/\[\]$/, '')
       if collection
@@ -119,26 +126,37 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
       end
     end
   end
-  
+
   include ::Rack::Test::Methods
   attr_reader :app, :html, :body
 
   alias_method :response, :last_response
   alias_method :request, :last_request
-  
+  alias_method :source, :body
+
   def initialize(app)
     @app = app
   end
-  
+
   def visit(path, attributes = {})
+    return if path.gsub(/^#{current_path}/, '') =~ /^#/
     get(path, attributes)
-    follow_redirect! while response.redirect?
+    follow_redirects!
     cache_body
   end
 
-  def submit(path, attributes)
-    post(path, attributes)
-    follow_redirect! while response.redirect?
+  def current_url
+    request.url rescue ""
+  end
+
+  def response_headers
+    response.headers
+  end
+
+  def submit(method, path, attributes)
+    path = current_path if not path or path.empty? 
+    send(method, path, attributes)
+    follow_redirects!
     cache_body
   end
 
@@ -146,7 +164,21 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
     html.xpath(selector).map { |node| Node.new(self, node) }
   end
 
-  private
+private
+
+  def current_path
+    request.path rescue ""
+  end
+  
+  def follow_redirects!
+    Capybara::WaitUntil.timeout(4) do
+      redirect = response.redirect?
+      follow_redirect! if redirect
+      not redirect
+    end
+  rescue Capybara::TimeoutError
+    raise Capybara::InfiniteRedirectError, "infinite redirect detected!"
+  end
 
   def cache_body
     @body = response.body

data/lib/capybara/driver/selenium_driver.rb

@@ -43,6 +43,10 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
       node.tag_name
     end
 
+    def visible?
+      node.displayed? and node.displayed? != "false"
+    end
+
   private
 
     def type
@@ -65,35 +69,49 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
 
   def initialize(app)
     @app = app
-    @rack_server = Capybara::Server.new(@app)
+    unless Capybara.app_host
+      @rack_server = Capybara::Server.new(@app)
+    end
   end
 
   def visit(path)
-    driver.navigate.to(url(path))
+    browser.navigate.to(url(path))
+  end
+
+  def source
+    browser.page_source
   end
 
   def body
-    driver.page_source
+    browser.page_source
+  end
+
+  def current_url
+    browser.current_url
   end
 
   def find(selector)
-    driver.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
+    browser.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
   end
 
   def wait?; true; end
 
   def evaluate_script(script)
-    driver.execute_script "return #{script}"
+    browser.execute_script "return #{script}"
+  end
+
+  def browser
+    self.class.driver
   end
 
 private
 
   def url(path)
-    rack_server.url(path)
-  end
-
-  def driver
-    self.class.driver
+    if rack_server
+      rack_server.url(path)
+    else
+      Capybara.app_host.to_s + path
+    end
   end
 
 end