mirror of
https://github.com/github/rails.git
synced 2026-01-28 07:48:00 -05:00
Make RJS treat symbolic action names nicely #3861 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -979,7 +979,7 @@ module ActionController #:nodoc:
|
||||
|
||||
def default_template_name(default_action_name = action_name)
|
||||
if default_action_name
|
||||
default_action_name = default_action_name.dup
|
||||
default_action_name = default_action_name.to_s.dup
|
||||
strip_out_controller!(default_action_name) if template_path_includes_controller?(default_action_name)
|
||||
end
|
||||
"#{self.class.controller_path}/#{default_action_name}"
|
||||
|
||||
@@ -30,6 +30,10 @@ class NewRenderTestController < ActionController::Base
|
||||
def render_action_hello_world
|
||||
render :action => "hello_world"
|
||||
end
|
||||
|
||||
def render_action_hello_world_as_symbol
|
||||
render :action => :hello_world
|
||||
end
|
||||
|
||||
def render_text_hello_world
|
||||
render :text => "hello world"
|
||||
@@ -282,6 +286,11 @@ class NewRenderTest < Test::Unit::TestCase
|
||||
assert_template "test/hello_world"
|
||||
end
|
||||
|
||||
def test_do_with_render_action_as_symbol
|
||||
get :render_action_hello_world_as_symbol
|
||||
assert_template "test/hello_world"
|
||||
end
|
||||
|
||||
def test_do_with_render_text
|
||||
get :render_text_hello_world
|
||||
assert_equal "hello world", @response.body
|
||||
|
||||
Reference in New Issue
Block a user