diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-06-28 16:46:10 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:08 +0200 |
| commit | 8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658 (patch) | |
| tree | 0add4bc56b06b30f4adf6097083ad88810d9fc74 /actionpack/test | |
| parent | 75d38e4364a292d8fddb89ff9959c88ab00ad7e9 (diff) | |
| download | rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.tar.gz rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.tar.bz2 rails-8c2c95e5d22d5e1ebade26f6eeaeda5089e4f658.zip | |
Fix AP test suite after moving stuff to AV
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract/abstract_controller_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/abstract/helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract/layouts_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/abstract/render_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb index eb9143c8f6..a161188b8e 100644 --- a/actionpack/test/abstract/abstract_controller_test.rb +++ b/actionpack/test/abstract/abstract_controller_test.rb @@ -29,7 +29,7 @@ module AbstractController # Test Render mixin # ==== class RenderingController < AbstractController::Base - include AbstractController::Rendering + include ActionView::Rendering def _prefixes [] @@ -153,7 +153,7 @@ module AbstractController # ==== # self._layout is used when defined class WithLayouts < PrefixedViews - include AbstractController::Layouts + include ActionView::Layouts private def self.layout(formats) diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb index bc3e34684c..555669efa5 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::Rendering + include ActionView::Rendering include AbstractController::Helpers def with_module diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb index 4a05c00f8b..168e40c610 100644 --- a/actionpack/test/abstract/layouts_test.rb +++ b/actionpack/test/abstract/layouts_test.rb @@ -5,8 +5,8 @@ module AbstractControllerTests # Base controller for these tests class Base < AbstractController::Base - include AbstractController::Rendering - include AbstractController::Layouts + include ActionView::Rendering + include ActionView::Layouts abstract! diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb index b9293d1241..56e5f48825 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::Rendering + include ActionView::Rendering def _prefixes %w[renderer] diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 8213997f4e..d4e984f998 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -271,6 +271,7 @@ end module ActionController class Base include ActionController::Testing + include ActionView::Layouts # This stub emulates the Railtie including the URL helpers from a Rails application include SharedTestRoutes.url_helpers include SharedTestRoutes.mounted_helpers |