Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 1812dbbfde6354ae2ea0bb20aaa32d177fa27979 1 parent e8c4cc9
@dhh dhh authored
View
2  actionpack/lib/action_controller/base.rb
@@ -979,7 +979,7 @@ def assert_existance_of_template_file(template_name)
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}"
View
9 actionpack/test/controller/new_render_test.rb
@@ -30,6 +30,10 @@ def render_hello_world_from_variable
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 @@ def test_do_with_render_action
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
Please sign in to comment.
Something went wrong with that request. Please try again.