From 7b1f483fda4fc8e4fc931649364a211a9f9d945f Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 15 Jun 2009 16:14:45 -0700
Subject: Get all of rake tests to pass

---
 railties/test/rails_info_controller_test.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'railties/test')

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
 
-- 
cgit v1.2.3