diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-09 13:07:30 -0300 |
| commit | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (patch) | |
| tree | c169325ddd18aedd18c66f22a53ba04190a0a41e /actionpack/test/new_base/test_helper.rb | |
| parent | 8885b2d6c1855742600d0afdb9dfc002acb62e5e (diff) | |
| parent | 8ee0c598dbe3f9fd133e85c69c6e43f62056646c (diff) | |
| download | rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.gz rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.bz2 rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/new_base/test_helper.rb')
| -rw-r--r-- | actionpack/test/new_base/test_helper.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb index d29449ddc1..89c29d9af3 100644 --- a/actionpack/test/new_base/test_helper.rb +++ b/actionpack/test/new_base/test_helper.rb @@ -26,14 +26,14 @@ require 'rack/test' module ActionController class Base2 < AbstractBase - use AbstractController::Callbacks - use AbstractController::Helpers - use AbstractController::Logger + include AbstractController::Callbacks + include AbstractController::Helpers + include AbstractController::Logger - use ActionController::HideActions - use ActionController::UrlFor - use ActionController::Renderer - use ActionController::Layouts + include ActionController::HideActions + include ActionController::UrlFor + include ActionController::Renderer + include ActionController::Layouts def self.inherited(klass) ::ActionController::Base2.subclasses << klass.to_s |