Changeset 5828

Timestamp:

01/01/07 03:03:13 (2 years ago)

Author:

minam

Message:

Make sure html_document is reset between integration test requests (closes #6834)

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/integration.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/integration.rb

@@ -494 +494 @@
-      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!