aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller/test_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/abstract_controller/test_helper.rb')
-rw-r--r--actionpack/test/abstract_controller/test_helper.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
index b9248c6bbd..a0375a0e99 100644
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ b/actionpack/test/abstract_controller/test_helper.rb
@@ -2,9 +2,13 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'rubygems'
require 'test/unit'
-require 'active_support'
+require 'active_support/core/all'
require 'active_support/test_case'
+require 'action_controller/abstract'
+require 'action_controller/new_base/base'
+require 'action_controller/new_base/renderer'
require 'action_controller'
require 'action_view/base'
require 'fixture_template'
@@ -17,7 +21,6 @@ rescue LoadError
# Debugging disabled. `gem install ruby-debug` to enable.
end
-require 'action_controller/abstract'
# require 'action_controller/abstract/base'
# require 'action_controller/abstract/renderer'
# require 'action_controller/abstract/layouts'