Render implicit html template when xhr request now supports localization [#1886 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
new file mode 100644
index 0000000000..0740b2d07c
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
@@ -0,0 +1 @@
+Hey HTML!
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 5586434cb6..9db62d9c23 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -44,6 +44,25 @@ module RenderTestCases
     I18n.locale = old_locale
   end
 
+  def test_render_implicit_html_template_from_xhr_request
+    old_format = @view.template_format
+    @view.template_format = :js
+    assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+  ensure
+    @view.template_format = old_format
+  end
+
+  def test_render_implicit_html_template_from_xhr_request_with_localization
+    old_locale = I18n.locale
+    old_format = @view.template_format
+    I18n.locale = :da
+    @view.template_format = :js
+    assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
+  ensure
+    I18n.locale = old_locale
+    @view.template_format = old_format
+  end
+
   def test_render_file_at_top_level
     assert_equal 'Elastica', @view.render(:file => '/shared')
   end