public
Fork of rails/rails
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/josh/rails.git
Search Repo:
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
jamis (author)
Sun Dec 31 19:04:23 -0800 2006
commit  c26cca3f458b07b144af15fb9ec9ad2b3319be5e
tree    8b18ee546f3d2d10d1a623eea0804a2df21dc25e
parent  b0303e1ac25c75836a8d2a733876d79e32884456
...
1
2
 
 
3
4
5
...
1
2
3
4
5
6
7
0
@@ -1,5 +1,7 @@
0
 *1.13.0 RC2*
0
 
0
+* Make sure html_document is reset between integration test requests. [ctm]
0
+
0
 * 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]
0
 
0
 * 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]
...
493
494
495
 
 
496
497
498
...
493
494
495
496
497
498
499
500
0
@@ -493,6 +493,8 @@ module ActionController
0
     %w(get post cookies assigns xml_http_request).each do |method|
0
       define_method(method) do |*args|
0
         reset! unless @integration_session
0
+ # reset the html_document variable, but only for new get/post calls
0
+ @html_document = nil unless %w(cookies assigns).include?(method)
0
         returning @integration_session.send(method, *args) do
0
           copy_session_variables!
0
         end

Comments

    No one has commented yet.