Merge pull request #5288 from lest/patch-2

force response body to be read in assert_template

actionpack/lib/action_controller/test_case.rb

@@ -69,6 +69,10 @@ def process(*args)
     #   assert_template :partial => '_customer', :locals => { :customer => @customer }
     #
     def assert_template(options = {}, message = nil)
+      # Force body to be read in case the
+      # template is being streamed
+      response.body
+
       case options
       when NilClass, String, Symbol
         options = options.to_s if Symbol === options

actionpack/test/controller/layout_test.rb

@@ -78,6 +78,13 @@ def test_namespaced_controllers_auto_detect_layouts2
 class DefaultLayoutController < LayoutTest
 end
 
+class StreamingLayoutController < LayoutTest
+  def render(*args)
+    options = args.extract_options! || {}
+    super(*args, options.merge(:stream => true))
+  end
+end
+
 class AbsolutePathLayoutController < LayoutTest
   layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test')
 end
@@ -122,6 +129,12 @@ def test_layout_set_when_using_default_layout
     assert_template :layout => "layouts/layout_test"
   end
 
+  def test_layout_set_when_using_streaming_layout
+    @controller = StreamingLayoutController.new
+    get :hello
+    assert_template :hello
+  end
+
   def test_layout_set_when_set_in_controller
     @controller = HasOwnLayoutController.new
     get :hello