diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-24 12:10:38 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-24 12:10:38 +0000 |
| commit | 4687306c2c1d94b0db6d66625867d881838b76d6 (patch) | |
| tree | ec54e4d91113e8d3b6a481912a687aa97e3c63e2 /actionpack/test/controller | |
| parent | 2f340d050b0327d809b10bb661ee0dd127777256 (diff) | |
| parent | 6ed42ebdff05f9d28a60e91093d8f9afad03a958 (diff) | |
| download | rails-4687306c2c1d94b0db6d66625867d881838b76d6.tar.gz rails-4687306c2c1d94b0db6d66625867d881838b76d6.tar.bz2 rails-4687306c2c1d94b0db6d66625867d881838b76d6.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/images/fxn.jpg
railties/guides/rails_guides/generator.rb
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/rack_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/send_file_test.rb | 4 |
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 |