Merge branch 'master' of git@github.com:rails/rails

1 files changed, 14 insertions, 0 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 462fba7045..d5320596d5 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -246,6 +246,15 @@ class TestController < ActionController::Base
            :locals => { :local_name => name }
   end
 
+  def helper_method_to_render_to_string(*args)
+    render_to_string(*args)
+  end
+  helper_method :helper_method_to_render_to_string
+
+  def render_html_only_partial_within_inline
+    render :inline => "Hello world <%= helper_method_to_render_to_string :partial => 'test/partial_with_only_html_version' %>"
+  end
+
   def formatted_html_erb
   end
 
@@ -932,6 +941,11 @@ class RenderTest < ActionController::TestCase
     assert_equal "Goodbye, Local David", @response.body
   end
 
+  def test_rendering_html_only_partial_within_inline_with_js
+    get :render_html_only_partial_within_inline, :format => :js
+    assert_equal "Hello world partial with only html version", @response.body
+  end
+
   def test_should_render_formatted_template
     get :formatted_html_erb
     assert_equal 'formatted html erb', @response.body