kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Get controller/render_other_test.rb to pass on new base and fixed a bug in new base with regards to rendering layouts.

Browse source
This commit is contained in:
Yehuda Katz + Carl Lerche 2009-05-22 16:50:26 -07:00
parent 63ed43cb99
commit 28dbeb3a64
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/abstract/layouts.rb
View file

@ -85,7 +85,7 @@ module AbstractController
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"

3
actionpack/lib/action_view/template/template.rb
View file

@ -15,11 +15,12 @@ module ActionView
@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)

14
actionpack/test/controller/render_other_test.rb
View file

@ -4,6 +4,7 @@ require 'pathname'
class TestController < ActionController::Base
protect_from_forgery
layout :determine_layout
module RenderTestHelper
def rjs_helper_method_from_module
@ -113,9 +114,16 @@ private
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"