Ensure backwards compatibility with symbolized action names for render_action (closes #3869) [anna@wota.jp]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3606 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
1e216b1d84
commit
8896efd41a
|
@ -664,7 +664,7 @@ module ActionController #:nodoc:
|
|||
end
|
||||
|
||||
def render_action(action_name, status = nil, with_layout = true)
|
||||
template = default_template_name(action_name)
|
||||
template = default_template_name(action_name.to_s)
|
||||
if with_layout && !template_exempt_from_layout?(template)
|
||||
render_with_layout(template, status)
|
||||
else
|
||||
|
|
|
@ -30,7 +30,11 @@ class TestController < ActionController::Base
|
|||
def render_action_hello_world
|
||||
render_action "hello_world"
|
||||
end
|
||||
|
||||
|
||||
def render_action_hello_world_with_symbol
|
||||
render_action :hello_world
|
||||
end
|
||||
|
||||
def render_text_hello_world
|
||||
render_text "hello world"
|
||||
end
|
||||
|
@ -137,6 +141,11 @@ class RenderTest < Test::Unit::TestCase
|
|||
assert_equal "test/hello_world", process_request.template.first_render
|
||||
end
|
||||
|
||||
def test_do_with_render_action_with_symbol
|
||||
@request.action = "render_action_hello_world_with_symbol"
|
||||
assert_equal "test/hello_world", process_request.template.first_render
|
||||
end
|
||||
|
||||
def test_do_with_render_text
|
||||
@request.action = "render_text_hello_world"
|
||||
assert_equal "hello world", process_request.body
|
||||
|
|
Loading…
Reference in New Issue