aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-03-12 21:47:34 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-12 21:47:34 -0700
commit91d274059536f09dffd87141e570c3eab9ebd9b4 (patch)
tree92fa61084a96f9b53b5248544c9ce12bfbf1f5dd /actionpack/test
parentc8c2b3820e662a2f9dfbfdae7211625adfabf15f (diff)
downloadrails-91d274059536f09dffd87141e570c3eab9ebd9b4.tar.gz
rails-91d274059536f09dffd87141e570c3eab9ebd9b4.tar.bz2
rails-91d274059536f09dffd87141e570c3eab9ebd9b4.zip
Return body parts directly to Rack rather than building a response string ourselves. Allows Rack middleware to orchestrate response building.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/rack_test.rb2
-rw-r--r--actionpack/test/controller/send_file_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb
index b550d3db78..89bf4fdacc 100644
--- a/actionpack/test/controller/rack_test.rb
+++ b/actionpack/test/controller/rack_test.rb
@@ -258,7 +258,7 @@ class RackResponseTest < BaseRackTest
}, headers)
parts = []
- body.each { |part| parts << part }
+ body.each { |part| parts << part.to_s }
assert_equal ["0", "1", "2", "3", "4"], parts
end
end
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index a27e951929..3d1904fee9 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -44,12 +44,12 @@ class SendFileTest < ActionController::TestCase
response = nil
assert_nothing_raised { response = process('file') }
assert_not_nil response
- assert_kind_of Proc, response.body
+ assert_kind_of Proc, response.body_parts
require 'stringio'
output = StringIO.new
output.binmode
- assert_nothing_raised { response.body.call(response, output) }
+ assert_nothing_raised { response.body_parts.call(response, output) }
assert_equal file_data, output.string
end