diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:53:20 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:53:20 -0700 |
| commit | 7dd072d333040d2bb1197baa55fddfb9b72053bd (patch) | |
| tree | 90218761072e9c213c8653db5ce30f43b0690476 /actionpack/test | |
| parent | e046f36824fcc164c284a13524c6b4153010a4e1 (diff) | |
| download | rails-7dd072d333040d2bb1197baa55fddfb9b72053bd.tar.gz rails-7dd072d333040d2bb1197baa55fddfb9b72053bd.tar.bz2 rails-7dd072d333040d2bb1197baa55fddfb9b72053bd.zip | |
A few more tweaks to get new Base running old render tests again
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit2.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/actionpack/test/abstract_unit2.rb b/actionpack/test/abstract_unit2.rb index c1e2631ac2..b95bfa0202 100644 --- a/actionpack/test/abstract_unit2.rb +++ b/actionpack/test/abstract_unit2.rb @@ -2,14 +2,6 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') $:.unshift(File.dirname(__FILE__) + '/lib') -# HAX -module ActionController - -end - -# TestCase -# include TestProcess2 - require 'test/unit' require 'active_support' @@ -17,16 +9,13 @@ require 'active_support/core/all' require 'active_support/test_case' require 'action_controller/abstract' require 'action_controller/new_base' -require 'action_controller/new_base/base' -require 'action_controller/new_base/renderer' # HAX -require 'action_controller' require 'fixture_template' +require 'action_controller/testing/process2' require 'action_view/test_case' FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') module ActionController - autoload :TestProcess2, 'action_controller/testing/process2' class ActionControllerError < StandardError #:nodoc: end @@ -158,7 +147,7 @@ module ActionController Base.view_paths = FIXTURE_LOAD_PATH class TestCase - include TestProcess2 + include TestProcess setup do ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' |