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.rb16
1 files changed, 14 insertions, 2 deletions
diff --git a/actionpack/test/abstract_controller/abstract_controller_test.rb b/actionpack/test/abstract_controller/abstract_controller_test.rb
index 22fc1a8c41..31c28a5c48 100644
--- a/actionpack/test/abstract_controller/abstract_controller_test.rb
+++ b/actionpack/test/abstract_controller/abstract_controller_test.rb
@@ -28,7 +28,14 @@ module AbstractController
# ====
class RenderingController < AbstractController::Base
include Renderer
-
+
+ def _prefix() end
+
+ def render(name = action_name, options = {})
+ options[:_prefix] = _prefix
+ super
+ end
+
append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
end
@@ -121,7 +128,12 @@ module AbstractController
def _layout
self.class.layout(formats)
- end
+ end
+
+ def render_to_string(name = action_name, options = {})
+ options[:_layout] = options[:layout] || _layout
+ super
+ end
end
class Me4 < WithLayouts