capybara 0.1.4 → 0.2.0

data/lib/capybara.rb

@@ -1,7 +1,7 @@
 require 'nokogiri'
 
 module Capybara
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 
   class CapybaraError < StandardError; end
   class DriverNotFoundError < CapybaraError; end

data/lib/capybara/driver/culerity_driver.rb

@@ -55,7 +55,6 @@ class Capybara::Driver::Culerity < Capybara::Driver::Base
   def initialize(app)
     @app = app
     @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot
   end
 
   def visit(path)

data/lib/capybara/driver/selenium_driver.rb

@@ -66,7 +66,6 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
   def initialize(app)
     @app = app
     @rack_server = Capybara::Server.new(@app)
-    @rack_server.boot
   end
 
   def visit(path)

data/lib/capybara/dsl.rb

@@ -50,7 +50,7 @@ module Capybara
     :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, :find_field, :find_link, :find_button,
-    :field_labeled, :all, :wait_for, :evaluate_script
+    :field_labeled, :all, :wait_for, :evaluate_script, :click
   ]
   SESSION_METHODS.each do |method|
     class_eval <<-RUBY, __FILE__, __LINE__+1

data/lib/capybara/server.rb

@@ -4,14 +4,27 @@ require 'rack'
 require 'rack/handler/mongrel'
 
 class Capybara::Server
-  attr_reader :app
-  
+  class Identify
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if env["REQUEST_PATH"] == "/__identify__"
+        [200, {}, @app.object_id.to_s]
+      else
+        @app.call(env)
+      end
+    end
+  end
+
+
+  attr_reader :app, :port
+
   def initialize(app)
     @app = app
-  end
-  
-  def port
-    8080
+    find_available_port
+    boot
   end
 
   def host
@@ -22,34 +35,59 @@ class Capybara::Server
     path = URI.parse(path).request_uri if path =~ /^http/
     "http://#{host}:#{port}#{path}"
   end
-  
+
+  def responsive?
+    is_running_on_port?(port)
+  end
+
+private
+
   def boot
     Capybara.log "application has already booted" and return if responsive?
     Capybara.log "booting Rack applicartion on port #{port}"
-    start_time = Time.now
-    Thread.new do
-      Rack::Handler::Mongrel.run @app, :Port => port
-    end
-    Capybara.log "checking if application has booted"
-    loop do
-      Capybara.log("application has booted") and break if responsive?
-      if Time.now - start_time > 10 
-        Capybara.log "Rack application timed out during boot"
-        exit
+
+    Timeout.timeout(10) do
+      Thread.new do
+        Rack::Handler::Mongrel.run Identify.new(@app), :Port => port
+      end
+      Capybara.log "checking if application has booted"
+
+      loop do
+        Capybara.log("application has booted") and break if responsive?
+        sleep 0.5
       end
-      
-      Capybara.log '.'
-      sleep 1
     end
+  rescue Timeout::Error
+    Capybara.log "Rack application timed out during boot"
+    exit
   end
 
-  def responsive?
-    res = Net::HTTP.start(host, port) { |http| http.get('/') }
+  def find_available_port
+    @port = 9887
+    @port += 1 while is_port_open?(@port) and not is_running_on_port?(@port)
+  end
+
+  def is_running_on_port?(tested_port)
+    res = Net::HTTP.start(host, tested_port) { |http| http.get('/__identify__') }
 
     if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
-      return true
+      return res.body == @app.object_id.to_s
+    end
+  rescue Errno::ECONNREFUSED
+    return false
+  end
+
+  def is_port_open?(tested_port)
+    Timeout::timeout(1) do
+      begin
+        s = TCPSocket.new(host, tested_port)
+        s.close
+        return true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      end
     end
-  rescue Errno::ECONNREFUSED 
+  rescue Timeout::Error
     return false
   end
 

data/lib/capybara/session.rb

@@ -25,6 +25,12 @@ module Capybara
       driver.visit(path)
     end
 
+    def click(locator)
+      link = wait_for(XPath.link(locator).button(locator))
+      raise Capybara::ElementNotFound, "no link or button '#{locator}' found" unless link
+      link.click
+    end
+
     def click_link(locator)
       link = wait_for(XPath.link(locator))
       raise Capybara::ElementNotFound, "no link with title, id or text '#{locator}' found" unless link

data/lib/capybara/xpath.rb

@@ -91,6 +91,14 @@ module Capybara
     def to_s
       @paths.join(' | ')
     end
+    
+    def append(path)
+      XPath.new(*[@paths, XPath.wrap(path).paths].flatten)
+    end
+    
+    def prepend(path)
+      XPath.new(*[XPath.wrap(path).paths, @paths].flatten)
+    end
 
   protected
   
@@ -111,14 +119,6 @@ module Capybara
         "'#{string}'"
       end
     end
-    
-    def prepend(path)
-      XPath.new(*[path, @paths].flatten)
-    end
-
-    def append(path)
-      XPath.new(*[@paths, path].flatten)
-    end
 
   end
 end

data/spec/session_spec.rb

@@ -21,6 +21,29 @@ shared_examples_for "session" do
       @session.body.should include('Another World')
     end
   end
+  
+  describe '#click' do
+    it "should click on a link" do
+      @session.visit('/with_html')
+      @session.click('labore')
+      @session.body.should include('<h1>Bar</h1>')
+    end
+    
+    it "should click on a button" do
+      @session.visit('/form')
+      @session.click('awe123')
+      extract_results(@session)['first_name'].should == 'John'
+    end
+    
+    context "with a locator that doesn't exist" do
+      it "should raise an error" do
+        @session.visit('/with_html')
+        running do
+          @session.click('does not exist')
+        end.should raise_error(Capybara::ElementNotFound)
+      end
+    end
+  end
 
   describe '#click_link' do
     before do
@@ -538,6 +561,7 @@ shared_examples_for "session" do
 
       it "should not break if no file is submitted" do
         @session.click_button('Upload')
+        @session.body.should include('No file uploaded')
       end
     end
 
@@ -871,6 +895,14 @@ shared_examples_for "session with javascript support" do
     end
   end
 
+  describe '#click' do
+    it "should wait for asynchronous load" do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      @session.click('Has been clicked')
+    end
+  end
+
   describe '#click_link' do
     it "should wait for asynchronous load" do
       @session.visit('/with_js')

data/spec/test_app.rb

@@ -50,7 +50,7 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload' do
-    params[:form][:document][:tempfile].read rescue ''
+    params[:form][:document][:tempfile].read rescue 'No file uploaded'
   end
 end
 

data/spec/xpath_spec.rb

@@ -29,6 +29,34 @@ describe Capybara::XPath do
     end
   end
   
+  describe '#append' do
+    it "should append an XPath's paths" do
+      @xpath = Capybara::XPath.wrap('//test')
+      @xpath = @xpath.append(Capybara::XPath.wrap('//foo/bar'))
+      @xpath.paths.should == ['//test', '//foo/bar']
+    end
+    
+    it "should append an String as a new path" do
+      @xpath = Capybara::XPath.wrap('//test')
+      @xpath = @xpath.append('//foo/bar')
+      @xpath.paths.should == ['//test', '//foo/bar']
+    end
+  end
+  
+  describe '#prepend' do
+    it "should prepend an XPath's paths" do
+      @xpath = Capybara::XPath.wrap('//test')
+      @xpath = @xpath.prepend(Capybara::XPath.wrap('//foo/bar'))
+      @xpath.paths.should == ['//foo/bar', '//test']
+    end
+    
+    it "should prepend an String as a new path" do
+      @xpath = Capybara::XPath.wrap('//test')
+      @xpath = @xpath.prepend('//foo/bar')
+      @xpath.paths.should == ['//foo/bar', '//test']
+    end
+  end
+  
   describe '#scope' do
     it "should prepend the given scope to all paths" do
       @xpath = Capybara::XPath.new('//foo/bar', '//test[@blah=foo]').scope('//quox')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 +01:00
+date: 2009-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency