Permalink
Browse files

Make sure html_document is reset between integration test requests (c…

…loses #6834)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a0b1ac2 commit b75f28edb4675250e5f18cf9760e4a11a5f4c926 @jamis jamis committed Jan 1, 2007
Showing with 4 additions and 0 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −0 actionpack/lib/action_controller/integration.rb
@@ -1,5 +1,7 @@
*SVN*
+* Make sure html_document is reset between integration test requests. [ctm]
+
* Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError. [Josh Susser]
* Routing uses URI escaping for path components and CGI escaping for query parameters. [darix, Jeremy Kemper]
@@ -493,6 +493,8 @@ def reset!
%w(get post cookies assigns xml_http_request).each do |method|
define_method(method) do |*args|
reset! unless @integration_session
+ # reset the html_document variable, but only for new get/post calls
+ @html_document = nil unless %w(cookies assigns).include?(method)
returning @integration_session.send(method, *args) do
copy_session_variables!
end

0 comments on commit b75f28e

Please sign in to comment.