Rename cleanup! to reset!

lib/capybara/driver/base.rb

@@ -46,7 +46,12 @@ class Capybara::Driver::Base
   def wait_until(*args)
   end
 
+  def reset!
+  end
+
   def cleanup!
+    warn "DEPRECATED: #cleanup! has been renamed to #reset!"
+    reset!
   end
 
   def has_shortcircuit_timeout?

lib/capybara/driver/celerity_driver.rb

@@ -140,7 +140,7 @@ class Capybara::Driver::Celerity < Capybara::Driver::Base
     @_browser
   end
 
-  def cleanup!
+  def reset!
     browser.clear_cookies
   end
 

lib/capybara/driver/rack_test_driver.rb

@@ -241,7 +241,7 @@ class Capybara::Driver::RackTest < Capybara::Driver::Base
   end
   alias_method :source, :body
 
-  def cleanup!
+  def reset!
     clear_cookies
   end
 

lib/capybara/driver/selenium_driver.rb

@@ -131,7 +131,7 @@ class Capybara::Driver::Selenium < Capybara::Driver::Base
     self.class.driver
   end
 
-  def cleanup!
+  def reset!
     browser.manage.delete_all_cookies
   end
 

lib/capybara/dsl.rb

@@ -55,7 +55,7 @@ module Capybara
     # as cookies.
     #
     def reset_sessions!
-      session_pool.each { |mode, session| session.cleanup! }
+      session_pool.each { |mode, session| session.reset! }
       @session_pool = nil
     end
 

lib/capybara/session.rb

@@ -56,9 +56,10 @@ module Capybara
     #
     # Reset the session, removing all cookies.
     #
-    def cleanup!
-      driver.cleanup!
+    def reset!
+      driver.reset!
     end
+    alias_method :cleanup!, :reset!
 
     ##
     #

lib/capybara/spec/driver.rb

@@ -155,7 +155,7 @@ shared_examples_for "driver with frame support" do
 end
 
 shared_examples_for "driver with cookies support" do
-  describe "#cleanup" do
+  describe "#reset!" do
     it "should set and clean cookies" do
       @driver.visit('/get_cookie')
       @driver.body.should_not include('test_cookie')
@@ -166,7 +166,7 @@ shared_examples_for "driver with cookies support" do
       @driver.visit('/get_cookie')
       @driver.body.should include('test_cookie')
 
-      @driver.cleanup!
+      @driver.reset!
       @driver.visit('/get_cookie')
       @driver.body.should_not include('test_cookie')
     end