aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller/abstract_controller_test.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-03-19 15:45:48 -0700
committerYehuda Katz <wycats@gmail.com>2009-03-19 15:45:48 -0700
commit890321e51e0c51f61f9198d247727e98f7485899 (patch)
tree19457c8d5e9bff3d3b3b16fc4861964e5297957c /actionpack/test/abstract_controller/abstract_controller_test.rb
parent8ab37c76608d7105c47566e79b85fcf72cb11e4b (diff)
downloadrails-890321e51e0c51f61f9198d247727e98f7485899.tar.gz
rails-890321e51e0c51f61f9198d247727e98f7485899.tar.bz2
rails-890321e51e0c51f61f9198d247727e98f7485899.zip
Get very basic layouts working.
* Required small architecture change
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