Fixed a bunch of tests that failed in 1.9 because they assumed that a Rack response was a String.

2 files changed, 5 insertions, 3 deletions

diff --git a/actionpack/test/controller/new_base/metal_test.rb b/actionpack/test/controller/new_base/metal_test.rb
index ab61fd98ee..45a6619eb4 100644
--- a/actionpack/test/controller/new_base/metal_test.rb
+++ b/actionpack/test/controller/new_base/metal_test.rb
@@ -18,6 +18,8 @@ module MetalTest
   end
 
   class TestMiddleware < ActiveSupport::TestCase
+    include RackTestUtils
+
     def setup
       @app = Rack::Builder.new do
         use MetalTest::MetalMiddleware
@@ -29,14 +31,14 @@ module MetalTest
       env = Rack::MockRequest.env_for("/authed")
       response = @app.call(env)
 
-      assert_equal "Hello World", response[2]
+      assert_equal "Hello World", body_to_string(response[2])
     end
 
     test "it can return a response using the normal AC::Metal techniques" do
       env = Rack::MockRequest.env_for("/")
       response = @app.call(env)
 
-      assert_equal "Not authed!", response[2]
+      assert_equal "Not authed!", body_to_string(response[2])
       assert_equal 401, response[0]
     end
   end
diff --git a/actionpack/test/controller/new_base/middleware_test.rb b/actionpack/test/controller/new_base/middleware_test.rb
index ada0215b1a..65942ebc15 100644
--- a/actionpack/test/controller/new_base/middleware_test.rb
+++ b/actionpack/test/controller/new_base/middleware_test.rb
@@ -44,7 +44,7 @@ module MiddlewareTest
 
     test "middleware that is 'use'd is called as part of the Rack application" do
       result = @app.call(env_for("/"))
-      assert_equal "Hello World", result[2]
+      assert_equal "Hello World", RackTestUtils.body_to_string(result[2])
       assert_equal "Success", result[1]["Middleware-Test"]
     end