Branch merge

README.rdoc

@@ -153,6 +153,20 @@ For ultimate control, you can instantiate and use a session manually.
     end
     session.click_link 'Sign in'
 
+== XPath an CSS
+
+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
+moving from Webrat and used CSS a lot, or simply generally prefer CSS:
+
+    Capybara.default_selector = :css
+    within('ul li') { ... }
+
 == Gotchas:
 
 * Install JRuby and the 'celerity' gem, version 0.7.4 (0.7.5 has a bug with
@@ -186,6 +200,14 @@ For ultimate control, you can instantiate and use a session manually.
   <tt><a href="/same/url#"></tt> instead. You can achieve this in Rails with
   <tt>link_to('foo', :anchor => '')</tt>
 
+== Contributors:
+
+The following people have dedicated their time and effort to Capybara:
+
+* Jonas Nicklas
+* Dennis Rogenius
+* Rob Holland
+
 == License:
 
 (The MIT License)

Rakefile

@@ -22,9 +22,8 @@ $hoe = Hoe.spec 'capybara' do
     ['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']

lib/capybara/cucumber.rb

@@ -7,10 +7,6 @@
   Capybara.reset_sessions!
 end
 
-require 'database_cleaner'
-require 'database_cleaner/cucumber'
-DatabaseCleaner.strategy = :truncation
-
 Before('@javascript') do
   Capybara.current_driver = Capybara.javascript_driver
 end
@@ -29,4 +25,4 @@
 
 After do
   Capybara.use_default_driver
-end
+end

lib/capybara/dsl.rb

@@ -9,7 +9,7 @@ def default_driver
     end
 
     def current_driver
-      @current_driver || default_driver 
+      @current_driver || default_driver
     end
     alias_method :mode, :current_driver
 
@@ -18,11 +18,17 @@ def javascript_driver
     end
 
     def use_default_driver
-      @current_driver = nil 
+      @current_driver = nil
     end
 
     def current_session
-      session_pool["#{current_driver}#{app.object_id}"] ||= Capybara::Session.new(current_driver, app)
+      session_pool["#{current_driver}#{app.object_id}"] ||= begin
+        Capybara::Session.new(current_driver, app)
+      end
+    end
+
+    def current_session?
+      session_pool.has_key?("#{current_driver}#{app.object_id}")
     end
 
     def reset_sessions!

lib/capybara/save_and_open_page.rb

@@ -3,10 +3,14 @@ module SaveAndOpenPage
     extend(self)
 
     def save_and_open_page(html)
-      require 'tempfile'
-      tempfile = Tempfile.new("capybara#{rand(1000000)}")
+      name="capybara-#{Time.new.strftime("%Y%m%d%H%M%S")}.html"
+
+      FileUtils.touch(name) unless File.exist?(name)
+
+      tempfile = File.new(name,'w')
       tempfile.write(rewrite_css_and_image_references(html))
       tempfile.close
+
       open_in_browser(tempfile.path)
     end