diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:27:44 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:31:03 -0700 |
commit | e046f36824fcc164c284a13524c6b4153010a4e1 (patch) | |
tree | 08e7420dc8cb23db244fb46bb9878ac653d6eb39 /actionpack/test/new_base/base_test.rb | |
parent | b1d34b3aa42beaf6a9fb93f114aed8fe08ebd9db (diff) | |
download | rails-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/new_base/base_test.rb')
-rw-r--r-- | actionpack/test/new_base/base_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/new_base/base_test.rb b/actionpack/test/new_base/base_test.rb index 27d1a7f026..a32653f128 100644 --- a/actionpack/test/new_base/base_test.rb +++ b/actionpack/test/new_base/base_test.rb @@ -2,7 +2,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") # Tests the controller dispatching happy path module Dispatching - class SimpleController < ActionController::Base2 + class SimpleController < ActionController::Base def index render :text => "success" end @@ -69,9 +69,9 @@ module Dispatching end end - class EmptyController < ActionController::Base2 ; end + class EmptyController < ActionController::Base ; end module Submodule - class ContainedEmptyController < ActionController::Base2 ; end + class ContainedEmptyController < ActionController::Base ; end end class ControllerClassTests < Test::Unit::TestCase |