Permalink
Browse files

Get controller/render_other_test.rb to pass on new base and fixed a b…

…ug in new base with regards to rendering layouts.
  • Loading branch information...
1 parent 63ed43c commit 28dbeb3a643eeb35767df55ed579f54438c3ee18 Yehuda Katz + Carl Lerche committed May 22, 2009
@@ -85,7 +85,7 @@ def _default_layout(require_layout = false, details = {:formats => formats})
end
begin
- _layout_for_name(_layout) if _action_has_layout?
+ _layout_for_name(_layout, details) if _action_has_layout?
rescue NameError => e
raise NoMethodError,
"You specified #{@_layout.inspect} as the layout, but no such method was found"
@@ -15,11 +15,12 @@ def initialize(source, identifier, handler, details)
@handler = handler
@details = details
- format = details[:format] || begin
+ format = details.delete(:format) || begin
# TODO: Clean this up
handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
end
@mime_type = Mime::Type.lookup_by_extension(format.to_s)
+ @details[:formats] = Array.wrap(format && format.to_sym)
end
def render(view, locals, &blk)
@@ -4,6 +4,7 @@
class TestController < ActionController::Base
protect_from_forgery
+ layout :determine_layout
module RenderTestHelper
def rjs_helper_method_from_module
@@ -113,9 +114,16 @@ def default_render
def determine_layout
case action_name
- when "render_js_with_explicit_template",
- "render_js_with_explicit_action_template",
- "delete_with_js", "update_page", "update_page_with_instance_variables"
+ when "hello_world", "layout_test", "rendering_without_layout",
+ "rendering_nothing_on_layout", "render_text_hello_world",
+ "render_text_hello_world_with_layout",
+ "hello_world_with_layout_false",
+ "partial_only", "partial_only_with_layout",
+ "accessing_params_in_template",
+ "accessing_params_in_template_with_layout",
+ "render_with_explicit_template",
+ "render_with_explicit_string_template",
+ "update_page", "update_page_with_instance_variables"
"layouts/standard"
when "action_talk_to_layout", "layout_overriding_layout"

0 comments on commit 28dbeb3

Please sign in to comment.