aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/integration_test.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 90afbfb9bc..c28050fe0d 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -374,16 +374,12 @@ class IntegrationProcessTest < ActionController::IntegrationTest
end
class MetalTest < ActionController::IntegrationTest
- require(File.dirname(__FILE__) + "/../../../railties/lib/rails/rack/metal.rb")
-
- class Poller < ::Rails::Rack::Metal
- def call(env)
+ class Poller
+ def self.call(env)
if env["PATH_INFO"] =~ /^\/success/
[200, {"Content-Type" => "text/plain"}, "Hello World!"]
- elsif env["PATH_INFO"] =~ /^\/failure/
- [404, {"Content-Type" => "text/plain"}, '']
else
- super
+ [404, {"Content-Type" => "text/plain"}, '']
end
end
end