aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/rails_info_controller_test.rb8
1 files changed, 7 insertions, 1 deletions
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