Skip to content
Browse files

r5515@ks: jeremy | 2006-10-08 13:24:42 -0700

 #6281
 r5516@ks:  jeremy | 2006-10-08 13:29:49 -0700
 respond_to :html doesn't assume .rhtml. Closes #6281.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5232 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 8ba8c7c commit 7ea86773a915ef8bebf1e23c3eed3a8b374d21b3 @jeremy jeremy committed Oct 8, 2006
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* respond_to :html doesn't assume .rhtml. #6281 [Hampton Catlin]
+
* Fixed some deprecation warnings in ActionPack [Rick Olson]
* assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them. #6240 [japgolly]
View
5 actionpack/lib/action_controller/mime_responds.rb
@@ -108,8 +108,9 @@ def respond_to(*types, &block)
class Responder #:nodoc:
DEFAULT_BLOCKS = [:html, :js, :xml].inject({}) do |blocks, ext|
- blocks.update ext => %(Proc.new { render :action => "\#{action_name}.r#{ext}", :content_type => Mime::#{ext.to_s.upcase} })
- end
+ template_extension = (ext == :html ? '' : ".r#{ext}")
+ blocks.update ext => %(Proc.new { render :action => "\#{action_name}#{template_extension}", :content_type => Mime::#{ext.to_s.upcase} })
+ end
def initialize(block_binding)
@block_binding = block_binding
View
17 actionpack/test/controller/mime_responds_test.rb
@@ -303,4 +303,21 @@ def test_forced_format
get :html_xml_or_rss, :format => "rss"
assert_equal "RSS", @response.body
end
+
+ def test_render_action_for_html
+ @controller.instance_eval do
+ def render(*args)
+ unless args.empty?
+ @action = args.first[:action]
+ end
+ response.body = @action
+ end
+ end
+
+ get :using_defaults
+ assert_equal "using_defaults", @response.body
+
+ get :using_defaults, :format => "xml"
+ assert_equal "using_defaults.rxml", @response.body
+ end
end

0 comments on commit 7ea8677

Please sign in to comment.
Something went wrong with that request. Please try again.