diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-05-02 14:57:40 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-05-02 14:57:40 -0500 |
commit | a8b75c480fc9774252f5976dcf1a614079822e56 (patch) | |
tree | b2567b106a5a87472340bdeab54f4b1880fe06df /actionpack/lib/action_dispatch/testing | |
parent | 3900f4007ee6463b8936af23c04017a900673866 (diff) | |
download | rails-a8b75c480fc9774252f5976dcf1a614079822e56.tar.gz rails-a8b75c480fc9774252f5976dcf1a614079822e56.tar.bz2 rails-a8b75c480fc9774252f5976dcf1a614079822e56.zip |
Functional test runner finalizes response just like the integration test runner. In both runners, the @response object will now behave the same.
Some functional tests will need to be updated if they are relying on preprocessed data on the response.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/test_response.rb | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_response.rb b/actionpack/lib/action_dispatch/testing/test_response.rb index c5464f1559..c35982e075 100644 --- a/actionpack/lib/action_dispatch/testing/test_response.rb +++ b/actionpack/lib/action_dispatch/testing/test_response.rb @@ -93,6 +93,12 @@ module ActionDispatch ActiveSupport::Deprecation.warn("response.has_template_object? has been deprecated. Use tempate.assigns[name].nil? instead", caller) !template_objects[name].nil? end + + # Returns binary content (downloadable file), converted to a String + def binary_content + ActiveSupport::Deprecation.warn("response.binary_content has been deprecated. Use response.body instead", caller) + body + end end include DeprecatedHelpers @@ -121,17 +127,5 @@ module ActionDispatch def client_error? (400..499).include?(response_code) end - - # Returns binary content (downloadable file), converted to a String - def binary_content - raise "Response body is not a Proc: #{body_parts.inspect}" unless body_parts.kind_of?(Proc) - require 'stringio' - - sio = StringIO.new - body_parts.call(self, sio) - - sio.rewind - sio.read - end end end |