Skip to content
Browse files

Make sure html_document is reset between integration test requests

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent b0303e1 commit c26cca3f458b07b144af15fb9ec9ad2b3319be5e @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
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*1.13.0 RC2*
+* 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]
* Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting. Closes #6128. [Rick Olson]
View
2 actionpack/lib/action_controller/integration.rb
@@ -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 c26cca3

Please sign in to comment.
Something went wrong with that request. Please try again.