capybara 0.1.1 → 0.1.2

data/Manifest.txt

@@ -2,9 +2,7 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
-examples/webcat.rb
 lib/capybara.rb
-lib/capybara/core_ext/tcp_socket.rb
 lib/capybara/cucumber.rb
 lib/capybara/driver/culerity_driver.rb
 lib/capybara/driver/firewatir_driver.rb

data/README.rdoc

@@ -86,6 +86,8 @@ Navigation:
 Scoping:
 
     within – Takes a block which executes in the given scope
+    within_fieldset – Execute the block in the fieldset given by id or legend
+    within_table – Execute the block in the table given by id or caption
 
 Interaction:
 
@@ -151,8 +153,10 @@ Capybara is hosted on Gemcutter, install it with:
 
 == Gotchas:
 
-* Install JRuby and the 'jarib-celerity' gem (not the 'celerity' gem) for
-  Culerity support.
+* Install JRuby and the 'celerity' gem, version 0.7.4 (0.7.5 has a bug with
+  password fields) under JRuby for Culerity support. Also you'll need to install
+  teh edge version of Culerity until a new gem release becomes available, since
+  0.2.3 does not work (at all!) with Capybara.
 
 * Everything is *case sensitive*. Capybara heavily relies on XPath, which
   doesn't support case insensitive searches.
@@ -165,7 +169,7 @@ Capybara is hosted on Gemcutter, install it with:
 * Domain names (including subdomains) don't work under rack-test. Since it's a
   pain to set up subdomains for the other drivers anyway, you should consider an
   alternate solution. You might use
-  [default_url_options](https://gist.github.com/643a758320a2926bd2ed) in Rails
+  {default_url_options}[https://gist.github.com/643a758320a2926bd2ed] in Rails
   for example.
 
 * The <tt>set_hidden_field</tt> method from Webrat is not implemented, since it doesn't

data/Rakefile

@@ -18,11 +18,17 @@ $hoe = Hoe.spec 'capybara' do
 
   self.extra_deps = [
     ['nokogiri', '>= 1.3.3'],
-    ['culerity', '>= 0.2.3'],
+    ['culerity', '>= 0.2.4'],
     ['selenium-webdriver', '>= 0.0.3'],
     ['rack', '>= 1.0.0'],
+    ['rack-test', '>= 0.5.2'],
     ['database_cleaner', '>= 0.2.3']
   ]
+  
+  self.extra_dev_deps = [
+    ['sinatra', '>= 0.9.4'],
+    ['rspec', '>= 1.2.9']
+  ]
 end
 
 require 'newgem/tasks'

data/lib/capybara.rb

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

data/lib/capybara/dsl.rb

@@ -44,8 +44,9 @@ module Capybara
 
   SESSION_METHODS = [
     :visit, :body, :click_link, :click_button, :fill_in, :choose, :has_xpath?, :has_css?,
-    :check, :uncheck, :attach_file, :select, :has_content?, :within, :save_and_open_page,
-    :find_field, :find_link, :find_button, :field_labeled
+    :check, :uncheck, :attach_file, :select, :has_content?, :within, :within_fieldset,
+    :within_table, :save_and_open_page, :find_field, :find_link, :find_button,
+    :field_labeled
   ]
   SESSION_METHODS.each do |method|
     class_eval <<-RUBY, __FILE__, __LINE__+1

data/lib/capybara/session.rb

@@ -1,4 +1,16 @@
 class Capybara::Session
+  
+  FIELDS_PATHS = {
+    :text_field => proc { |id| "//input[@type='text'][@id='#{id}']" },
+    :text_area => proc { |id| "//textarea[@id='#{id}']" },
+    :password_field => proc { |id| "//input[@type='password'][@id='#{id}']" },
+    :radio => proc { |id| "//input[@type='radio'][@id='#{id}']" },
+    :hidden_field => proc { |id| "//input[@type='hidden'][@id='#{id}']" },
+    :checkbox => proc { |id| "//input[@type='checkbox'][@id='#{id}']" },
+    :select => proc { |id| "//select[@id='#{id}']" },
+    :file_field => proc { |id| "//input[@type='file'][@id='#{id}']" }
+  }
+  
   attr_reader :mode, :app
 
   def initialize(mode, app)
@@ -88,6 +100,18 @@ class Capybara::Session
     scopes.pop
   end
   
+  def within_fieldset(locator)
+    within "//fieldset[@id='#{locator}' or contains(legend,'#{locator}')]" do
+      yield
+    end
+  end
+  
+  def within_table(locator)
+    within "//table[@id='#{locator}' or contains(caption,'#{locator}')]" do
+      yield
+    end
+  end
+  
   def save_and_open_page
     require 'capybara/save_and_open_page'
     Capybara::SaveAndOpenPage.save_and_open_page(body)
@@ -102,18 +126,13 @@ class Capybara::Session
   alias_method :field_labeled, :find_field
   
   def find_link(locator)
-    link = find_element("//a[@id='#{locator}']", "//a[contains(.,'#{locator}')]", "//a[@title='#{locator}']")
+    link = find("//a[@id='#{locator}' or contains(.,'#{locator}') or @title='#{locator}']").first
     raise Capybara::ElementNotFound, "no link with title, id or text '#{locator}' found" unless link
     link
   end
   
   def find_button(locator)
-    button = find_element(
-      "//input[@type='submit'][@id='#{locator}']",
-      "//input[@type='submit'][@value='#{locator}']",
-      "//input[@type='image'][@id='#{locator}']",
-      "//input[@type='image'][@value='#{locator}']"
-    )
+    button = find("//input[@type='submit' or @type='image'][@id='#{locator}' or @value='#{locator}']").first
     raise Capybara::ElementNotFound, "no button with value or id '#{locator}' found" unless button
     button
   end
@@ -143,17 +162,6 @@ private
     @scopes ||= []
   end
 
-  FIELDS_PATHS = {
-    :text_field => proc { |id| "//input[@type='text'][@id='#{id}']" },
-    :text_area => proc { |id| "//textarea[@id='#{id}']" },
-    :password_field => proc { |id| "//input[@type='password'][@id='#{id}']" },
-    :radio => proc { |id| "//input[@type='radio'][@id='#{id}']" },
-    :hidden_field => proc { |id| "//input[@type='hidden'][@id='#{id}']" },
-    :checkbox => proc { |id| "//input[@type='checkbox'][@id='#{id}']" },
-    :select => proc { |id| "//select[@id='#{id}']" },
-    :file_field => proc { |id| "//input[@type='file'][@id='#{id}']" }
-  }
-
   def find_field_by_id(locator, *kinds)
     kinds.each do |kind|
       path = FIELDS_PATHS[kind]
@@ -173,14 +181,6 @@ private
     end
     return nil
   end
-
-  def find_element(*locators)
-    locators.each do |locator|
-      element = find(locator).first
-      return element if element
-    end
-    return nil
-  end
   
   def find(locator)
     locator = current_scope.to_s + locator

data/spec/driver/firewatir_driver_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
-describe Capybara::Driver::FireWatir do
-  before do
-    @driver = Capybara::Driver::FireWatir.new(TestApp)
-  end
-  
-  # it_should_behave_like "driver"
-  # it_should_behave_like "driver with javascript support"
-end
+# describe Capybara::Driver::FireWatir do
+#   before do
+#     @driver = Capybara::Driver::FireWatir.new(TestApp)
+#   end
+#   
+#   it_should_behave_like "driver"
+#   it_should_behave_like "driver with javascript support"
+# end

data/spec/driver/safariwarit_driver_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
-describe Capybara::Driver::SafariWatir do
-  before do
-    @driver = Capybara::Driver::SafariWatir.new(TestApp)
-  end
-  
-  # it_should_behave_like "driver"
-  # it_should_behave_like "driver with javascript support"
-end
+# describe Capybara::Driver::SafariWatir do
+#   before do
+#     @driver = Capybara::Driver::SafariWatir.new(TestApp)
+#   end
+#   
+#   it_should_behave_like "driver"
+#   it_should_behave_like "driver with javascript support"
+# end

data/spec/session_spec.rb

@@ -594,6 +594,50 @@ shared_examples_for "session" do
       end
     end
   end
+  
+  describe '#within_fieldset' do
+    before do
+      @session.visit('/fieldsets')
+    end
+    
+    it "should restrict scope to a fieldset given by id" do
+      @session.within_fieldset("villain_fieldset") do
+        @session.fill_in("Name", :with => 'Goldfinger')
+        @session.click_button("Create")
+      end
+      extract_results(@session)['villain_name'].should == 'Goldfinger'
+    end
+    
+    it "should restrict scope to a fieldset given by legend" do
+      @session.within_fieldset("Villain") do
+        @session.fill_in("Name", :with => 'Goldfinger')
+        @session.click_button("Create")
+      end
+      extract_results(@session)['villain_name'].should == 'Goldfinger'
+    end
+  end
+  
+  describe '#within_table' do
+    before do
+      @session.visit('/tables')
+    end
+    
+    it "should restrict scope to a fieldset given by id" do
+      @session.within_table("girl_table") do
+        @session.fill_in("Name", :with => 'Christmas')
+        @session.click_button("Create")
+      end
+      extract_results(@session)['girl_name'].should == 'Christmas'
+    end
+    
+    it "should restrict scope to a fieldset given by legend" do
+      @session.within_table("Villain") do
+        @session.fill_in("Name", :with => 'Quantum')
+        @session.click_button("Create")
+      end
+      extract_results(@session)['villain_name'].should == 'Quantum'
+    end
+  end
 end
 
 describe Capybara::Session do

data/spec/test_app.rb

@@ -12,31 +12,7 @@ class TestApp < Sinatra::Base
   get '/foo' do
     'Another World'
   end
-
-  get '/with_html' do
-    erb :with_html
-  end
-
-  get '/with_js' do
-    erb :with_js
-  end
-
-  get '/with_simple_html' do
-    erb :with_simple_html
-  end
-
-  get '/with_scope' do
-    erb :with_scope
-  end
-
-  get '/form' do
-    erb :form
-  end
-
-  post '/redirect' do
-    redirect '/redirect_again'
-  end
-
+  
   get '/redirect' do
     redirect '/redirect_again'
   end
@@ -48,12 +24,24 @@ class TestApp < Sinatra::Base
   get '/landed' do
     "You landed"
   end
-
-  post '/form' do
+  
+  get '/form/get' do
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end
   
-  get '/form/get' do
+  get '/favicon.ico' do
+    nil
+  end
+
+  get '/:view' do |view|
+    erb view.to_sym
+  end
+
+  post '/redirect' do
+    redirect '/redirect_again'
+  end
+
+  post '/form' do
     '<pre id="results">' + params[:form].to_yaml + '</pre>'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +01:00
+date: 2009-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: 0.2.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
   type: :runtime
@@ -62,6 +72,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -93,9 +123,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- examples/webcat.rb
 - lib/capybara.rb
-- lib/capybara/core_ext/tcp_socket.rb
 - lib/capybara/cucumber.rb
 - lib/capybara/driver/culerity_driver.rb
 - lib/capybara/driver/firewatir_driver.rb

data/examples/webcat.rb

@@ -1,36 +0,0 @@
-session = Capybara::Session.new('http://localhost:3000')
-
-session.visit '/'
-
-session.driver.trigger :click, '//div[@id=foo]//a'
-session.driver.trigger :mouseover, '#foo a.bar' # will be ignored by drivers who do not support it
-
-nodelist = session.find 'li#foo a'
-nodelist.empty?
-nodelist.first.tag_name   # => 'a'
-nodelist.first.text       # => 'a cute link'
-nodelist.first.html       # => 'a <em>cute</em> link'
-nodelist.first.attributes # => { :href => '/blah' }
-nodelist.first.trigger :click
-
-session.request.url # => '/blah'
-session.response.ok? # => true
-
-# fancy stuff, just builds on the stuff above!
-
-session.click_link 'a cute link'
-session.click_button 'an awesome button'
-session.within '#foo' do
-  click_link 'a cute link'
-end
-session.fill_in 'foo', :with => 'bar'
-session.choose 'Monkey'
-session.check 'I am awesome'
-session.wait_for '#fooo"
-
-# In cuke:
-
-When 'I am awesome' do
-  page.check 'I am awesome'
-  page.click_button 'FooBar'
-end

data/lib/capybara/core_ext/tcp_socket.rb

@@ -1,26 +0,0 @@
-class TCPSocket
-  def self.wait_for_service_with_timeout(options)
-    start_time = Time.now
-
-    until listening_service?(options)
-      verbose_wait
-
-      if options[:timeout] && (Time.now > start_time + options[:timeout])
-        raise SocketError.new("Socket did not open within #{options[:timeout]} seconds")
-      end
-    end
-  end
-
-  def self.wait_for_service_termination_with_timeout(options)
-    start_time = Time.now
-
-    while listening_service?(options)
-      verbose_wait
-
-      if options[:timeout] && (Time.now > start_time + options[:timeout])
-        raise SocketError.new("Socket did not terminate within #{options[:timeout]} seconds")
-      end
-    end
-  end
-end
-