diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
commit | 71f7e75d95c47e4283a7cac0a2f776abf0a11d0e (patch) | |
tree | 75a9b6825f9f81a9bec372af8db097b6ea022fc6 /actionpack/test/controller/new_base/metal_test.rb | |
parent | 2d7abe245e7a2b1717e48ef550e4083318fd7ec2 (diff) | |
parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
download | rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.gz rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.bz2 rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.zip |
Merge branch 'master' into orchestra
Diffstat (limited to 'actionpack/test/controller/new_base/metal_test.rb')
-rw-r--r-- | actionpack/test/controller/new_base/metal_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/metal_test.rb b/actionpack/test/controller/new_base/metal_test.rb index e1d46b906e..ab61fd98ee 100644 --- a/actionpack/test/controller/new_base/metal_test.rb +++ b/actionpack/test/controller/new_base/metal_test.rb @@ -20,8 +20,8 @@ module MetalTest class TestMiddleware < ActiveSupport::TestCase def setup @app = Rack::Builder.new do - use MetalMiddleware - run Endpoint.new + use MetalTest::MetalMiddleware + run MetalTest::Endpoint.new end.to_app end |