diff options
author | Carl Lerche <carllerche@mac.com> | 2009-03-20 16:50:51 -0700 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-03-23 10:23:14 -0700 |
commit | c6123c37030b715d088860ea1ca79060659b0e3c (patch) | |
tree | 36da3c375333660c0ff41dcf113dfdf3f82c9bde /actionpack/test/abstract_controller/abstract_controller_test.rb | |
parent | 81e814adfad6d4bba1af5f70a5a409f6d71f8f6c (diff) | |
download | rails-c6123c37030b715d088860ea1ca79060659b0e3c.tar.gz rails-c6123c37030b715d088860ea1ca79060659b0e3c.tar.bz2 rails-c6123c37030b715d088860ea1ca79060659b0e3c.zip |
Finished implementing layout for render :text
Diffstat (limited to 'actionpack/test/abstract_controller/abstract_controller_test.rb')
-rw-r--r-- | actionpack/test/abstract_controller/abstract_controller_test.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/test/abstract_controller/abstract_controller_test.rb b/actionpack/test/abstract_controller/abstract_controller_test.rb index 31c28a5c48..96193fd24c 100644 --- a/actionpack/test/abstract_controller/abstract_controller_test.rb +++ b/actionpack/test/abstract_controller/abstract_controller_test.rb @@ -31,7 +31,11 @@ module AbstractController def _prefix() end - def render(name = action_name, options = {}) + def render(options = {}) + if options.is_a?(String) + options = {:_template_name => options} + end + options[:_prefix] = _prefix super end @@ -130,7 +134,7 @@ module AbstractController self.class.layout(formats) end - def render_to_string(name = action_name, options = {}) + def render_to_string(options = {}) options[:_layout] = options[:layout] || _layout super end |