From a8b75c480fc9774252f5976dcf1a614079822e56 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 2 May 2009 14:57:40 -0500
Subject: 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.
---
 actionpack/lib/action_controller/testing/process.rb    |  5 ++++-
 actionpack/lib/action_dispatch/http/response.rb        |  2 +-
 .../lib/action_dispatch/testing/test_response.rb       | 18 ++++++------------
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index f62d18a1f9..b44ec2f94b 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -132,7 +132,10 @@ module ActionController #:nodoc:
 
       Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
 
-      @controller.process(@request, @response)
+      response = Rack::MockResponse.new(*@controller.process(@request, ActionDispatch::Response.new).to_a)
+      @response.request, @response.template = @request, @controller.template
+      @response.status, @response.headers, @response.body = response.status, response.headers, response.body
+      @response
     end
 
     def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 2618e284fe..133b4f7335 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -185,7 +185,7 @@ module ActionDispatch # :nodoc:
         @writer = lambda { |x| callback.call(x) }
         @body.call(self, self)
       else
-        @body.each(&callback)
+        @body.each { |part| callback.call(part.to_s) }
       end
 
       @writer = callback
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
-- 
cgit v1.2.3