capybara 0.1.3 → 0.1.4

data/Manifest.txt

@@ -4,10 +4,9 @@ README.rdoc
 Rakefile
 lib/capybara.rb
 lib/capybara/cucumber.rb
+lib/capybara/driver/base.rb
 lib/capybara/driver/culerity_driver.rb
-lib/capybara/driver/firewatir_driver.rb
 lib/capybara/driver/rack_test_driver.rb
-lib/capybara/driver/safariwatir_driver.rb
 lib/capybara/driver/selenium_driver.rb
 lib/capybara/dsl.rb
 lib/capybara/node.rb
@@ -15,17 +14,17 @@ lib/capybara/rails.rb
 lib/capybara/save_and_open_page.rb
 lib/capybara/server.rb
 lib/capybara/session.rb
+lib/capybara/xpath.rb
 script/console
 script/destroy
 script/generate
 spec/driver/culerity_driver_spec.rb
-spec/driver/firewatir_driver_spec.rb
 spec/driver/rack_test_driver_spec.rb
-spec/driver/safariwarit_driver_spec.rb
 spec/driver/selenium_driver_spec.rb
 spec/drivers_spec.rb
 spec/dsl_spec.rb
 spec/fixtures/test_file.txt
+spec/public/jquery-ui.js
 spec/public/jquery.js
 spec/save_and_open_page_spec.rb
 spec/session/culerity_session_spec.rb
@@ -42,3 +41,4 @@ spec/views/with_html.erb
 spec/views/with_js.erb
 spec/views/with_scope.erb
 spec/views/with_simple_html.erb
+spec/xpath_spec.rb

data/README.rdoc

@@ -119,6 +119,10 @@ Querying:
     find_button
     field_labeled
 
+Scripting:
+
+    evaluate_script – Returns the value of the executed javascript (only works on javascript supported drivers)
+
 Debugging:
 
     save_and_open_page
@@ -158,7 +162,7 @@ For ultimate control, you can instantiate and use a session manually.
 Capybara does not try to guess what kind of selector you are going to give it,
 if you want to use CSS with your 'within' declarations for example, you'll need
 to do:
-    
+
     within(:css, 'ul li') { ... }
 
 Alternatively you can set the default selector to CSS, which may help if you are
@@ -207,6 +211,9 @@ The following people have dedicated their time and effort to Capybara:
 * Jonas Nicklas
 * Dennis Rogenius
 * Rob Holland
+* Wincent Colaiuta
+* Andrea Fazzi
+* Aslak Hellesøy
 
 == License:
 
@@ -231,4 +238,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/capybara.rb

@@ -1,30 +1,36 @@
 require 'nokogiri'
 
 module Capybara
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   class CapybaraError < StandardError; end
   class DriverNotFoundError < CapybaraError; end
   class ElementNotFound < CapybaraError; end
+  class NotSupportedByDriverError < CapybaraError; end
 
   class << self
     attr_accessor :debug, :asset_root
-    
+    attr_writer :default_selector
+
+    def default_selector
+      @default_selector ||= :xpath
+    end
+
     def log(message)
       puts "[capybara] #{message}" if debug
       true
     end
   end
   
-  autoload :Server, 'capybara/server'
+  autoload :Server,  'capybara/server'
   autoload :Session, 'capybara/session'
-  autoload :Node, 'capybara/node'
+  autoload :Node,    'capybara/node'
+  autoload :XPath,   'capybara/xpath'
 
   module Driver
+    autoload :Base,     'capybara/driver/base'
     autoload :RackTest, 'capybara/driver/rack_test_driver'
     autoload :Culerity, 'capybara/driver/culerity_driver'
-    autoload :SafariWatir, 'capybara/driver/safariwatir_driver'
-    autoload :FireWatir, 'capybara/driver/firewatir_driver'
     autoload :Selenium, 'capybara/driver/selenium_driver'
   end
 end

data/lib/capybara/driver/base.rb

@@ -0,0 +1,17 @@
+class Capybara::Driver::Base
+  def visit(path)
+    raise "Not implemented"
+  end
+  
+  def find(query)
+    raise "Not implemented"
+  end
+  
+  def body
+    raise "Not implemented"
+  end
+  
+  def wait?
+    false
+  end
+end

data/lib/capybara/driver/culerity_driver.rb

@@ -1,11 +1,11 @@
 require 'culerity'
 
-class Capybara::Driver::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
@@ -18,22 +18,28 @@ class Capybara::Driver::Culerity
     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
 
   def self.server
@@ -51,25 +57,31 @@ class Capybara::Driver::Culerity
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot
   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,7 +1,8 @@
 require 'rack/test'
 require 'nokogiri'
+require 'cgi'
 
-class Capybara::Driver::RackTest
+class Capybara::Driver::RackTest < Capybara::Driver::Base
   class Node < Capybara::Node
     def text
       node.text
@@ -59,50 +60,39 @@ class Capybara::Driver::RackTest
 
   class Form < Node
     def params(button)
-      params = []
-      params += node.xpath(".//input[@type='text']", ".//input[@type='hidden']", ".//input[@type='password']").inject([]) do |agg, input|
-        agg << [input['name'].to_s, input['value'].to_s]
-        agg
+      params = {}
+      node.xpath(".//input[@type='text' or @type='hidden' or @type='password']").map do |input|
+        merge_param!(params, input['name'].to_s, input['value'].to_s)
       end
-      params += node.xpath(".//textarea").inject([]) do |agg, textarea|
-        agg << [textarea['name'].to_s, textarea.text.to_s]
-        agg
+      node.xpath(".//textarea").map do |textarea|
+        merge_param!(params, textarea['name'].to_s, textarea.text.to_s)
       end
-      params += node.xpath(".//input[@type='radio']").inject([]) do |agg, input|
-        agg << [input['name'].to_s, input['value'].to_s] if input['checked']
-        agg
+      node.xpath(".//input[@type='radio' or @type='checkbox']").map do |input|
+        merge_param!(params, input['name'].to_s, input['value'].to_s) if input['checked']
       end
-      params += node.xpath(".//input[@type='checkbox']").inject([]) do |agg, input|
-        agg << [input['name'].to_s, input['value'].to_s] if input['checked']
-        agg
-      end
-      params += node.xpath(".//select").inject([]) do |agg, select|
+      node.xpath(".//select").map do |select|
         option = select.xpath(".//option[@selected]").first
         option ||= select.xpath('.//option').first
-        agg << [select['name'].to_s, (option['value'] || option.text).to_s] if option 
-        agg
+        merge_param!(params, select['name'].to_s, (option['value'] || option.text).to_s) if option
       end
-      params += node.xpath(".//input[@type='file']").inject([]) do |agg, input|
-        if multipart?
-          agg << [input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s)]
-        else
-          agg << [input['name'].to_s, File.basename(input['value'].to_s)]
+      node.xpath(".//input[@type='file']").map do |input|
+        if input['value'].to_s.any?
+          if multipart?
+            merge_param!(params, input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s))
+          else
+            merge_param!(params, input['name'].to_s, File.basename(input['value'].to_s))
+          end
         end
-        agg
-      end
-      params.push [button[:name], button[:value]] if button[:name]
-      if multipart?
-        params.inject({}) { |agg, (key, value)| agg[key] = value; agg }
-      else
-        params.map { |key, value| "#{key}=#{value}" }.join('&')
       end
+      merge_param!(params, button[:name], button[:value]) if button[:name]
+      params
     end
 
     def submit(button)
       if post?
-        driver.submit(node['action'].to_s, params(button)) 
+        driver.submit(node['action'].to_s, params(button))
       else
-        driver.visit(node['action'].to_s.split('?').first + '?' + params(button)) 
+        driver.visit(node['action'].to_s, params(button))
       end
     end
 
@@ -113,6 +103,21 @@ class Capybara::Driver::RackTest
     def post?
       self[:method] =~ /post/i
     end
+    
+    private
+    
+    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
+    end
   end
   
   include ::Rack::Test::Methods
@@ -125,8 +130,8 @@ class Capybara::Driver::RackTest
     @app = app
   end
   
-  def visit(path)
-    get(path)
+  def visit(path, attributes = {})
+    get(path, attributes)
     follow_redirect! while response.redirect?
     cache_body
   end
@@ -134,9 +139,9 @@ class Capybara::Driver::RackTest
   def submit(path, attributes)
     post(path, attributes)
     follow_redirect! while response.redirect?
-    cache_body  
+    cache_body
   end
-  
+
   def find(selector)
     html.xpath(selector).map { |node| Node.new(self, node) }
   end

data/lib/capybara/driver/selenium_driver.rb

@@ -1,6 +1,6 @@
 require 'selenium-webdriver'
 
-class Capybara::Driver::Selenium
+class Capybara::Driver::Selenium < Capybara::Driver::Base
   class Node < Capybara::Node
     def text
       node.text
@@ -17,16 +17,13 @@ class Capybara::Driver::Selenium
     end
 
     def set(value)
-      if tag_name == 'input' and %w(text password hidden file).include?(type)
+      if tag_name == 'textarea' or (tag_name == 'input' and %w(text password hidden file).include?(type))
         node.clear
         node.send_keys(value.to_s)
       elsif tag_name == 'input' and type == 'radio'
         node.select
       elsif tag_name == 'input' and type == 'checkbox'
         node.toggle
-      elsif tag_name == "textarea"
-        node.clear
-        node.send_keys(value.to_s)
       end
     end
 
@@ -38,6 +35,10 @@ class Capybara::Driver::Selenium
       node.click
     end
 
+    def drag_to(element)
+      node.drag_and_drop_on(element.node)
+    end
+
     def tag_name
       node.tag_name
     end
@@ -80,6 +81,12 @@ class Capybara::Driver::Selenium
     driver.find_elements(:xpath, selector).map { |node| Node.new(self, node) }
   end
 
+  def wait?; true; end
+
+  def evaluate_script(script)
+    driver.execute_script "return #{script}"
+  end
+
 private
 
   def url(path)

data/lib/capybara/dsl.rb

@@ -12,7 +12,7 @@ module Capybara
       @current_driver || default_driver
     end
     alias_method :mode, :current_driver
-    
+
     def javascript_driver
       @javascript_driver || :selenium
     end
@@ -24,11 +24,11 @@ module Capybara
     def current_session
       session_pool["#{current_driver}#{app.object_id}"] ||= Capybara::Session.new(current_driver, app)
     end
-    
+
     def current_session?
       session_pool.has_key?("#{current_driver}#{app.object_id}")
     end
-    
+
     def reset_sessions!
       @session_pool = nil
     end
@@ -47,10 +47,10 @@ module Capybara
   end
 
   SESSION_METHODS = [
-    :visit, :body, :click_link, :click_button, :fill_in, :choose, :has_xpath?, :has_css?,
+    :visit, :body, :click_link, :click_button, :drag, :fill_in, :choose, :has_xpath?, :has_css?,
     :check, :uncheck, :attach_file, :select, :has_content?, :within, :within_fieldset,
-    :within_table, :save_and_open_page, :find_field, :find_link, :find_button,
-    :field_labeled
+    :within_table, :save_and_open_page, :find, :find_field, :find_link, :find_button,
+    :field_labeled, :all, :wait_for, :evaluate_script
   ]
   SESSION_METHODS.each do |method|
     class_eval <<-RUBY, __FILE__, __LINE__+1

data/lib/capybara/node.rb

@@ -9,11 +9,11 @@ class Capybara::Node
   def text
     raise "Not implemented"
   end
-  
+
   def [](name)
     raise "Not implemented"
   end
-  
+
   def value
     self[:value]
   end
@@ -21,7 +21,7 @@ class Capybara::Node
   def set(value)
     raise "Not implemented"
   end
-  
+
   def select(option)
     raise "Not implemented"
   end
@@ -29,8 +29,12 @@ class Capybara::Node
   def click
     raise "Not implemented"
   end
-  
+
+  def drag_to(element)
+    raise "Not implemented"
+  end
+
   def tag_name
     raise "Not implemented"
   end
-end
+end