diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 00:18:42 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 00:18:42 +0000 |
| commit | c396c5ab318d1100b50822907367d6b33f20aa85 (patch) | |
| tree | 849db301359f75b4bedc44d7961f3e3fabd1ff0d | |
| parent | cf965cda5c755b51292e7c959def80ea54ea41f8 (diff) | |
| download | rails-c396c5ab318d1100b50822907367d6b33f20aa85.tar.gz rails-c396c5ab318d1100b50822907367d6b33f20aa85.tar.bz2 rails-c396c5ab318d1100b50822907367d6b33f20aa85.zip | |
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
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 2cf28dd283..543cc3baa9 100644 --- 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 index 1a0fa8b7b6..f22f7a0250 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -332,9 +332,11 @@ module ActionController 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 |