From 3754822f43f2942f32f14ea326c9a7b2f344d056 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 20 Sep 2005 10:53:33 +0000
Subject: Fixed problem with send_file and WEBrick using stdout #1812

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2274 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/controller/send_file_test.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'actionpack/test/controller/send_file_test.rb')

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index b7674bda60..0a1cc256d2 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -47,16 +47,11 @@ class SendFileTest < Test::Unit::TestCase
     assert_not_nil response
     assert_kind_of Proc, response.body
 
-    old_stdout = $stdout
-    begin
-      require 'stringio'
-      $stdout = StringIO.new
-      $stdout.binmode
-      assert_nothing_raised { response.body.call }
-      assert_equal file_data, $stdout.string
-    ensure
-      $stdout = old_stdout
-    end
+    require 'stringio'
+    output = StringIO.new
+    output.binmode
+    assert_nothing_raised { response.body.call(response, output) }
+    assert_equal file_data, output.string
   end
 
   def test_data
-- 
cgit v1.2.3