aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-23 22:37:52 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-23 22:38:19 -0500
commit4a55d1de8d42694bd060d834c549c53c079dd747 (patch)
tree925ccc0313668a1b9187ed1e6688aee49994031b /actionpack/lib/action_dispatch.rb
parent3600c3840e8d0c612c974e6af5ce010535492fbe (diff)
downloadrails-4a55d1de8d42694bd060d834c549c53c079dd747.tar.gz
rails-4a55d1de8d42694bd060d834c549c53c079dd747.tar.bz2
rails-4a55d1de8d42694bd060d834c549c53c079dd747.zip
Move integration test runner into ActionDispatch
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
-rw-r--r--actionpack/lib/action_dispatch.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 5bcd2143a3..be69a2062b 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -38,11 +38,15 @@ module ActionDispatch
autoload :ShowExceptions, 'action_dispatch/middleware/show_exceptions'
autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
- autoload :HTML, 'action_controller/vendor/html-scanner'
autoload :Assertions, 'action_dispatch/testing/assertions'
+ autoload :Integration, 'action_dispatch/testing/integration'
+ autoload :IntegrationTest, 'action_dispatch/testing/integration'
+ autoload :PerformanceTest, 'action_dispatch/testing/performance_test'
autoload :TestRequest, 'action_dispatch/testing/test_request'
autoload :TestResponse, 'action_dispatch/testing/test_response'
+ autoload :HTML, 'action_controller/vendor/html-scanner'
+
module Http
autoload :Headers, 'action_dispatch/http/headers'
end