aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:27:44 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:31:03 -0700
commite046f36824fcc164c284a13524c6b4153010a4e1 (patch)
tree08e7420dc8cb23db244fb46bb9878ac653d6eb39 /actionpack/test/abstract_controller
parentb1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db (diff)
downloadrails-e046f36824fcc164c284a13524c6b4153010a4e1.tar.gz
rails-e046f36824fcc164c284a13524c6b4153010a4e1.tar.bz2
rails-e046f36824fcc164c284a13524c6b4153010a4e1.zip
Renamed Base2 to Base and don't require old action_controller for new Base
Diffstat (limited to 'actionpack/test/abstract_controller')
-rw-r--r--actionpack/test/abstract_controller/test_helper.rb13
1 files changed, 2 insertions, 11 deletions
diff --git a/actionpack/test/abstract_controller/test_helper.rb b/actionpack/test/abstract_controller/test_helper.rb
index a0375a0e99..f0556e63e2 100644
--- a/actionpack/test/abstract_controller/test_helper.rb
+++ b/actionpack/test/abstract_controller/test_helper.rb
@@ -7,10 +7,7 @@ require 'test/unit'
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 'action_view'
require 'fixture_template'
begin
@@ -19,10 +16,4 @@ begin
Debugger.start
rescue LoadError
# Debugging disabled. `gem install ruby-debug` to enable.
-end
-
-# require 'action_controller/abstract/base'
-# require 'action_controller/abstract/renderer'
-# require 'action_controller/abstract/layouts'
-# require 'action_controller/abstract/callbacks'
-# require 'action_controller/abstract/helpers' \ No newline at end of file
+end \ No newline at end of file