diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-18 11:54:51 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-18 11:54:51 -0700 |
| commit | cf6e025a4538e488ed35f61f1f7f3498833a34e6 (patch) | |
| tree | 6a28d5beac35e74a33243668baf7a9a60edf6724 /actionpack/lib/action_controller/new_base/testing.rb | |
| parent | 628110d7eeb446fee7f9e043f113c083d24883c1 (diff) | |
| parent | 195fadbfd31294d43634afb7bbf4f0ffc86b470a (diff) | |
| download | rails-cf6e025a4538e488ed35f61f1f7f3498833a34e6.tar.gz rails-cf6e025a4538e488ed35f61f1f7f3498833a34e6.tar.bz2 rails-cf6e025a4538e488ed35f61f1f7f3498833a34e6.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/new_base/testing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/testing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb index 106990b9ba..b39d8d539d 100644 --- a/actionpack/lib/action_controller/new_base/testing.rb +++ b/actionpack/lib/action_controller/new_base/testing.rb @@ -7,7 +7,7 @@ module ActionController @_response = response @_response.request = request ret = process(request.parameters[:action]) - @_response.body = self.response_body + @_response.body = self.response_body || " " @_response.prepare! set_test_assigns ret |