aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller/abstract_controller_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/abstract_controller/abstract_controller_test.rb')
-rw-r--r--actionpack/test/abstract_controller/abstract_controller_test.rb8
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