Get all of rake tests to pass

2 files changed, 9 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8e5e5736ab..924c58e0e8 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -20,12 +20,14 @@ module ActionController
   # require 'action_controller/routing'
   autoload :Caching,           'action_controller/caching'
   autoload :Dispatcher,        'action_controller/dispatch/dispatcher'
+  autoload :Integration,       'action_controller/testing/integration'
   autoload :MimeResponds,      'action_controller/old_base/mime_responds'
   autoload :PolymorphicRoutes, 'action_controller/routing/generation/polymorphic_routes'
   autoload :RecordIdentifier,  'action_controller/record_identifier'
   autoload :Resources,         'action_controller/routing/resources'
   autoload :SessionManagement, 'action_controller/old_base/session_management'
   autoload :TestCase,          'action_controller/testing/test_case'
+  autoload :TestProcess,       'action_controller/testing/process'
   autoload :UrlRewriter,       'action_controller/routing/generation/url_rewriter'
   autoload :UrlWriter,         'action_controller/routing/generation/url_rewriter'
 
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index ab31f3a487..3deb81965c 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 require 'action_controller'
-require 'action_controller/testing/process'
+require 'action_controller/testing/process2'
 
 require 'rails/info'
 require 'rails/info_controller'
@@ -9,6 +9,12 @@ ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
 end
 
+module ActionController
+  class Base
+    include ActionController::Testing
+  end
+end
+
 class InfoControllerTest < ActionController::TestCase
   tests Rails::InfoController