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 | |
| 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')
| -rw-r--r-- | actionpack/test/abstract_controller/callbacks_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_controller/layouts_test.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/new_base/test_helper.rb | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/test/abstract_controller/callbacks_test.rb b/actionpack/test/abstract_controller/callbacks_test.rb index 5fce30f478..89243b631e 100644 --- a/actionpack/test/abstract_controller/callbacks_test.rb +++ b/actionpack/test/abstract_controller/callbacks_test.rb @@ -4,7 +4,7 @@ module AbstractController module Testing class ControllerWithCallbacks < AbstractController::Base - use AbstractController::Callbacks + include AbstractController::Callbacks end class Callback1 < ControllerWithCallbacks diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb index 3d4570bfef..a305a30a54 100644 --- a/actionpack/test/abstract_controller/layouts_test.rb +++ b/actionpack/test/abstract_controller/layouts_test.rb @@ -5,9 +5,9 @@ module AbstractControllerTests # Base controller for these tests class Base < AbstractController::Base - use AbstractController::Renderer - use AbstractController::Layouts - + include AbstractController::Renderer + include AbstractController::Layouts + self.view_paths = [ActionView::FixtureTemplate::FixturePath.new( "layouts/hello.erb" => "With String <%= yield %>", "layouts/hello_override.erb" => "With Override <%= yield %>", 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 |