diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 11:28:16 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 11:28:16 -0800 |
| commit | fa8849a573aa98750fc5fdacf557d973b85072ca (patch) | |
| tree | 0c343cdc94eb861413b3f70b1ecf329468dce684 /actionpack/test/abstract | |
| parent | c06aff0a7e42868e9788d6cefe5ce49e93cbf45b (diff) | |
| parent | f09ad263cabe2e781c1994b85375fee8deba4317 (diff) | |
| download | rails-fa8849a573aa98750fc5fdacf557d973b85072ca.tar.gz rails-fa8849a573aa98750fc5fdacf557d973b85072ca.tar.bz2 rails-fa8849a573aa98750fc5fdacf557d973b85072ca.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/abstract')
| -rw-r--r-- | actionpack/test/abstract/abstract_controller_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/layouts_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/localized_cache_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/render_test.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb index 524381509d..4ad87d9762 100644 --- a/actionpack/test/abstract/abstract_controller_test.rb +++ b/actionpack/test/abstract/abstract_controller_test.rb @@ -28,7 +28,7 @@ module AbstractController # Test Render mixin # ==== class RenderingController < AbstractController::Base - include ::AbstractController::RenderingController + include ::AbstractController::Rendering def _prefix() end diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb index efcd68e5c8..ade29140ba 100644 --- a/actionpack/test/abstract/helper_test.rb +++ b/actionpack/test/abstract/helper_test.rb @@ -6,7 +6,7 @@ module AbstractController module Testing class ControllerWithHelpers < AbstractController::Base - include AbstractController::RenderingController + include AbstractController::Rendering include Helpers def with_module diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb index 5028c19b80..df73d948f0 100644 --- a/actionpack/test/abstract/layouts_test.rb +++ b/actionpack/test/abstract/layouts_test.rb @@ -6,7 +6,7 @@ module AbstractControllerTests # Base controller for these tests class Base < AbstractController::Base - include AbstractController::RenderingController + include AbstractController::Rendering include AbstractController::Layouts self.view_paths = [ActionView::FixtureResolver.new( diff --git a/actionpack/test/abstract/localized_cache_test.rb b/actionpack/test/abstract/localized_cache_test.rb index 6f9bb693f7..8b0b0fff03 100644 --- a/actionpack/test/abstract/localized_cache_test.rb +++ b/actionpack/test/abstract/localized_cache_test.rb @@ -4,7 +4,7 @@ module AbstractController module Testing class CachedController < AbstractController::Base - include AbstractController::RenderingController + include AbstractController::Rendering include AbstractController::LocalizedCache self.view_paths = [ActionView::FixtureResolver.new( diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb index 331cb6f769..be0478b638 100644 --- a/actionpack/test/abstract/render_test.rb +++ b/actionpack/test/abstract/render_test.rb @@ -4,7 +4,7 @@ module AbstractController module Testing class ControllerRenderer < AbstractController::Base - include AbstractController::RenderingController + include AbstractController::Rendering self.view_paths = [ActionView::FixtureResolver.new( "default.erb" => "With Default", |