aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-19 12:52:52 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-19 12:52:52 -0500
commitdb0af8075d84ceb086ebad2e0b6f839fe588ddc2 (patch)
tree3f9f472aecc5cc9d92fee59b51330f820888e11d /actionpack
parent355e2350ca5ce203acfb7f71914339e289b37570 (diff)
downloadrails-db0af8075d84ceb086ebad2e0b6f839fe588ddc2.tar.gz
rails-db0af8075d84ceb086ebad2e0b6f839fe588ddc2.tar.bz2
rails-db0af8075d84ceb086ebad2e0b6f839fe588ddc2.zip
Avoid conflict with a "MetalTest" module used in tests
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/integration_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 93f5bfa272..9f56bbfd46 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -377,7 +377,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
end
end
-class MetalTest < ActionController::IntegrationTest
+class MetalIntegrationTest < ActionController::IntegrationTest
class Poller
def self.call(env)
if env["PATH_INFO"] =~ /^\/success/