Set template_format to html inside rjs templates so renders within it default to html.

2 files changed, 0 insertions, 20 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 795ad97863..c5496a9af5 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -246,15 +246,6 @@ 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 render_implicit_html_template
   end
 
@@ -948,11 +939,6 @@ 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_render_in_an_rjs_template_should_pick_html_templates_when_available
     [:js, "js"].each do |format|
       assert_nothing_raised do
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 9e827abbca..0387a11de2 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -137,12 +137,6 @@ module RenderTestCases
   end
 
   # TODO: The reason for this test is unclear, improve documentation
-  def test_render_js_partial_and_fallback_to_erb_layout
-    @view.template_format = :js
-    assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
-  end
-
-  # TODO: The reason for this test is unclear, improve documentation
   def test_render_missing_xml_partial_and_raise_missing_template
     @view.template_format = :xml
     assert_raise(ActionView::MissingTemplate) { @view.render(:partial => "test/layout_for_partial") }