Permalink
Browse files

Autoload AC and AV test case classes

  • Loading branch information...
1 parent 45462c5 commit cf83a6f16b730f5536d4e11af894a04b24723212 @josh josh committed Jan 4, 2010
@@ -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
@@ -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:
@@ -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'
@@ -1,5 +1,4 @@
require 'active_support/test_case'
-require 'action_controller/test_case'
module ActionView
class Base
@@ -20,7 +20,6 @@
require 'action_dispatch'
require 'fixture_template'
require 'active_support/test_case'
-require 'action_view/test_case'
require 'active_support/dependencies'
activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
@@ -8,10 +8,6 @@
require 'test/unit'
require 'active_support/core_ext/kernel/requires'
-# AP is always present
-require 'action_controller/test_case'
-require 'action_view/test_case'
-
require 'action_mailer/test_case' if defined?(ActionMailer)
require 'active_model/test_case' if defined?(ActiveModel)
@@ -1,6 +1,5 @@
require 'abstract_unit'
require 'action_controller'
-require 'action_controller/test_case'
require 'rails/info'
require 'rails/info_controller'

0 comments on commit cf83a6f

Please sign in to comment.