aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-02-23 17:39:20 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2015-02-23 17:39:20 -0200
commit88b334ec696ffe1fa08b934780f4ab27030c5c76 (patch)
treea19661109550a3bebb79d33f4a594c546d34aa72 /actionpack/test/controller/new_base
parentacb12d3f4ff80cf8cf7c6739b888e267110c6d30 (diff)
parent3c181f66a380dc696f1e8846a934b0d314a2bff4 (diff)
downloadrails-88b334ec696ffe1fa08b934780f4ab27030c5c76.tar.gz
rails-88b334ec696ffe1fa08b934780f4ab27030c5c76.tar.bz2
rails-88b334ec696ffe1fa08b934780f4ab27030c5c76.zip
Merge pull request #19038 from tchandy/cleaning_actionpack_tests
Cleaning actionpack tests
Diffstat (limited to 'actionpack/test/controller/new_base')
-rw-r--r--actionpack/test/controller/new_base/metal_test.rb6
-rw-r--r--actionpack/test/controller/new_base/middleware_test.rb2
2 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/test/controller/new_base/metal_test.rb b/actionpack/test/controller/new_base/metal_test.rb
index 45a6619eb4..537b93387a 100644
--- a/actionpack/test/controller/new_base/metal_test.rb
+++ b/actionpack/test/controller/new_base/metal_test.rb
@@ -18,8 +18,6 @@ module MetalTest
end
class TestMiddleware < ActiveSupport::TestCase
- include RackTestUtils
-
def setup
@app = Rack::Builder.new do
use MetalTest::MetalMiddleware
@@ -31,14 +29,14 @@ module MetalTest
env = Rack::MockRequest.env_for("/authed")
response = @app.call(env)
- assert_equal "Hello World", body_to_string(response[2])
+ assert_equal ["Hello World"], 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!", body_to_string(response[2])
+ assert_equal ["Not authed!"], 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 6b7b5e10e3..a30e937bb3 100644
--- a/actionpack/test/controller/new_base/middleware_test.rb
+++ b/actionpack/test/controller/new_base/middleware_test.rb
@@ -75,7 +75,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", RackTestUtils.body_to_string(result[2])
+ assert_equal ["Hello World"], result[2]
assert_equal "Success", result[1]["Middleware-Test"]
end