Integration tests behave well with render_component. Closes #4632.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4582 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jul 8, 2006 · c396c5a · c396c5a
1 parent cf965cd
commit c396c5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com]
+
 * Added exception handling of missing layouts #5373 [chris@ozmm.org]
 
 * Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]

diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
@@ -332,9 +332,11 @@ module ClassMethods #:nodoc:
         def clear_last_instantiation!
           self.last_instantiation = nil
         end
-    
+
         def new_with_capture(*args)
-          self.last_instantiation ||= new_without_capture(*args)
+          controller = new_without_capture(*args)
+          self.last_instantiation ||= controller
+          controller
         end
       end
     end