aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 16:03:46 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:31:03 -0700
commitb1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db (patch)
treeb7b9a6b04634938a5114266913e2ac00f9a8cbcd /actionpack/test/abstract_controller
parent918b119bd3310c15dab4eb8a3317cc2a32503119 (diff)
downloadrails-b1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db.tar.gz
rails-b1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db.tar.bz2
rails-b1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db.zip
Starting to get new_base to run on old tests
Diffstat (limited to 'actionpack/test/abstract_controller')
-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'