From a5013bb5af299db6bf97f67d4198220280717e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 5 Mar 2012 11:27:14 -0800
Subject: Merge pull request #5288 from lest/patch-2

force response body to be read in assert_template
Conflicts:
	actionpack/lib/action_controller/test_case.rb
---
 actionpack/lib/action_controller/test_case.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/lib/action_controller/test_case.rb')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index b574a36430..bc6828a805 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -70,6 +70,8 @@ module ActionController
     #
     def assert_template(options = {}, message = nil)
       validate_request!
+      # Force body to be read in case the template is being streamed
+      response.body
 
       case options
       when NilClass, String, Symbol
-- 
cgit v1.2.3