From e046f36824fcc164c284a13524c6b4153010a4e1 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Fri, 1 May 2009 17:27:44 -0700 Subject: Renamed Base2 to Base and don't require old action_controller for new Base --- actionpack/test/abstract_controller/test_helper.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'actionpack/test/abstract_controller') 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 -- cgit v1.2.3