diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-05 11:27:14 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-17 09:25:12 -0200 |
| commit | a5013bb5af299db6bf97f67d4198220280717e80 (patch) | |
| tree | 4c97d6cbf2f285fe5b0be56dd318d9fda32b1707 /actionpack/lib | |
| parent | d3dcb4b9b26c1ea8b44ee8660af10683cd41e35f (diff) | |
| download | rails-a5013bb5af299db6bf97f67d4198220280717e80.tar.gz rails-a5013bb5af299db6bf97f67d4198220280717e80.tar.bz2 rails-a5013bb5af299db6bf97f67d4198220280717e80.zip | |
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
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |