2 files changed, 19 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index fed8d40b47..48cf0ab9cb 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -83,6 +83,19 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "rendering with template exception logs the exception" do
+      io = StringIO.new
+      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+
+      begin
+        get "/render_streaming/basic/template_exception"
+        io.rewind
+        assert_match "(undefined method `invalid!' for nil:NilClass)", io.read
+      ensure
+        ActionController::Base.logger = _old
+      end
+    end
+
     test "do not stream on HTTP/1.0" do
       get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
       assert_body "Hello world, I'm here!"
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 4d69081570..b2df8efee3 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -13,8 +13,12 @@ class FiberedTest < ActiveSupport::TestCase
     @controller_view = TestController.new.view_context
   end
 
+  def render_body(options)
+    @view.view_renderer.render_body(@view, options)
+  end
+
   def buffered_render(options)
-    body = @view.render_body(options)
+    body = render_body(options)
     string = ""
     body.each do |piece|
       string << piece
@@ -24,7 +28,7 @@ class FiberedTest < ActiveSupport::TestCase
 
   def test_streaming_works
     content = []
-    body = @view.render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
+    body = render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
 
     body.each do |piece|
       content << piece