From cf83a6f16b730f5536d4e11af894a04b24723212 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 4 Jan 2010 15:59:23 -0600
Subject: Autoload AC and AV test case classes

---
 actionpack/lib/action_controller.rb           | 8 +++++---
 actionpack/lib/action_controller/test_case.rb | 1 -
 actionpack/lib/action_view.rb                 | 2 ++
 actionpack/lib/action_view/test_case.rb       | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d66fc3fcc9..e6cd055a59 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -27,22 +27,24 @@ module ActionController
     autoload :MimeResponds
     autoload :RackDelegation
     autoload :Redirecting
-    autoload :Rendering
     autoload :Renderers
+    autoload :Rendering
     autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
     autoload :SessionManagement
     autoload :Streaming
+    autoload :Testing
     autoload :UrlFor
     autoload :Verification
   end
 
   autoload :Dispatcher,      'action_controller/dispatch/dispatcher'
-  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
-  autoload :Routing,         'action_controller/deprecated'
   autoload :Integration,     'action_controller/deprecated/integration_test'
   autoload :IntegrationTest, 'action_controller/deprecated/integration_test'
+  autoload :PerformanceTest, 'action_controller/deprecated/performance_test'
+  autoload :Routing,         'action_controller/deprecated'
+  autoload :TestCase,        'action_controller/test_case'
 
   eager_autoload do
     autoload :RecordIdentifier
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 398ea52495..155db0af8f 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,6 +1,5 @@
 require 'active_support/test_case'
 require 'rack/session/abstract/id'
-require 'action_controller/metal/testing'
 
 module ActionController
   class TestRequest < ActionDispatch::TestRequest #:nodoc:
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 8ce6e82524..93aa69c060 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -52,6 +52,8 @@ module ActionView
     autoload :TemplateHandler,   'action_view/template'
     autoload :TemplateHandlers,  'action_view/template'
   end
+
+  autoload :TestCase, 'action_view/test_case'
 end
 
 require 'action_view/erb/util'
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index be9a2ed50d..1ca427505d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,4 @@
 require 'active_support/test_case'
-require 'action_controller/test_case'
 
 module ActionView
   class Base
-- 
cgit v1.2.3