Merge remote branch 'robholland/headers'

squarelover · Mar 22, 2010 · bc688be · bc688be
2 parents aa8adc3 + 64d115a
commit bc688be
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb
@@ -176,7 +176,7 @@ def merge_param!(params, key, value)
   end
 
   include ::Rack::Test::Methods
-  attr_reader :app, :html, :body
+  attr_reader :app
 
   alias_method :response, :last_response
   alias_method :request, :last_request
@@ -190,7 +190,6 @@ def visit(path, attributes = {})
     return if path.gsub(/^#{current_path}/, '') =~ /^#/
     get(path, attributes, env)
     follow_redirects!
-    cache_body
   end
 
   def current_url
@@ -205,13 +204,20 @@ def submit(method, path, attributes)
     path = current_path if not path or path.empty?
     send(method, path, attributes, env)
     follow_redirects!
-    cache_body
   end
 
   def find(selector)
     html.xpath(selector).map { |node| Node.new(self, node) }
   end
-
+
+  def body
+    @body ||= response.body
+  end
+
+  def html
+    @html ||= Nokogiri::HTML(body)
+  end
+
 private
 
   def build_rack_mock_session # :nodoc:
@@ -242,9 +248,9 @@ def env
     env
   end
 
-  def cache_body
-    @body = response.body
-    @html = Nokogiri::HTML(body)
+  def reset_cache
+    @body = nil
+    @html = nil
   end
 
 end
diff --git a/lib/capybara/session.rb b/lib/capybara/session.rb
@@ -1,7 +1,9 @@
+require 'forwardable'
 require 'capybara/wait_until'
 
 module Capybara
   class Session
+    extend Forwardable
     include Searchable
 
     DSL_METHODS = [
@@ -30,21 +32,12 @@ def driver
       end
     end
 
-    def cleanup!
-      driver.cleanup!
-    end
-
-    def current_url
-      driver.current_url
-    end
-
-    def response_headers
-      driver.response_headers
-    end
-
-    def visit(path)
-      driver.visit(path)
-    end
+    def_delegator :driver, :cleanup!
+    def_delegator :driver, :current_url
+    def_delegator :driver, :response_headers
+    def_delegator :driver, :visit
+    def_delegator :driver, :body
+    def_delegator :driver, :source
 
     def click(locator)
       msg = "no link or button '#{locator}' found"
@@ -102,14 +95,6 @@ def attach_file(locator, path)
       locate(:xpath, XPath.file_field(locator), msg).set(path)
     end
 
-    def body
-      driver.body
-    end
-
-    def source
-      driver.source
-    end
-
     def within(kind, scope=nil)
       kind, scope = Capybara.default_selector, kind unless scope
       scope = XPath.from_css(scope) if kind == :css