Skip to content
This repository
Browse code

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...
commit c26cca3f458b07b144af15fb9ec9ad2b3319be5e 1 parent b0303e1
Jamis Buck jamis authored
2  actionpack/CHANGELOG
... ... @@ -1,5 +1,7 @@
1 1 *1.13.0 RC2*
2 2
  3 +* Make sure html_document is reset between integration test requests. [ctm]
  4 +
3 5 * 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]
4 6
5 7 * 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]
2  actionpack/lib/action_controller/integration.rb
@@ -493,6 +493,8 @@ def reset!
493 493 %w(get post cookies assigns xml_http_request).each do |method|
494 494 define_method(method) do |*args|
495 495 reset! unless @integration_session
  496 + # reset the html_document variable, but only for new get/post calls
  497 + @html_document = nil unless %w(cookies assigns).include?(method)
496 498 returning @integration_session.send(method, *args) do
497 499 copy_session_variables!
498 500 end

0 comments on commit c26cca3

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