Permalink
Browse files

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
  • Loading branch information...
jeremy committed Jul 8, 2006
1 parent cf965cd commit c396c5ab318d1100b50822907367d6b33f20aa85
Showing with 6 additions and 2 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +4 −2 actionpack/lib/action_controller/integration.rb
View
@@ -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]
@@ -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

0 comments on commit c396c5a

Please sign in to comment.