diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-07-12 14:33:46 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-07-12 14:33:46 -0500 |
| commit | 73b34e9f75d33dc0709d4ad36c912bdbb8977994 (patch) | |
| tree | eea7cb8c3cb428ecfacb6263f4e8f1d903a71824 /actionpack/lib/action_controller/test_process.rb | |
| parent | 30204c4e66cea989c4ee48b52c8827c79e98f14a (diff) | |
| download | rails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.tar.gz rails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.tar.bz2 rails-73b34e9f75d33dc0709d4ad36c912bdbb8977994.zip | |
Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class.
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 8ae73a66f4..52884a93f4 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -207,13 +207,9 @@ module ActionController #:nodoc: # Returns the template path of the file which was used to # render this response (or nil) - def rendered_file(with_controller=false) - unless template.first_render.nil? - unless with_controller - template.first_render - else - template.first_render.split('/').last || template.first_render - end + def rendered_file(with_controller = false) + if template.first_render + template.first_render.to_s end end |