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

Restore implicit rendering for XHR requests that want a HTML template [#1590 state:resolved]

Browse source
This commit is contained in:
Joshua Peek 2009-01-27 14:09:11 -06:00
parent f17c87665e
commit 093f758bd0
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,9 @@ module ActionView #:nodoc:
return template
elsif template = load_path[template_path]
return template
# Try to find html version if the format is javascript
elsif format == :js && template = load_path["#{template_path}.html"]
return template
end
end

8
actionpack/test/controller/render_test.rb
View file

@ -274,6 +274,9 @@ class TestController < ActionController::Base
def render_explicit_html_template
end
def render_implicit_html_template_from_xhr_request
end
def formatted_html_erb
end
@ -1010,6 +1013,11 @@ class RenderTest < ActionController::TestCase
end
end
def test_should_implicitly_render_html_template_from_xhr_request
get :render_implicit_html_template_from_xhr_request, :format => :js
assert_equal "Hello HTML!", @response.body
end
def test_should_render_formatted_template
get :formatted_html_erb
assert_equal 'formatted html erb', @response.body

1
actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb vendored Normal file
View file

@ -0,0 +1 @@
Hello HTML!