diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/components.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/components_test.rb | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index db0f37fd9a..3117fe3b1e 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Deprecate standalone components. [Jeremy Kemper] + * assert_select_rjs :remove. [Dylan Egan] * Always clear model associations from session. #4795 [sd@notso.net, andylien@gmail.com] diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index a7f5be2e6a..e6b0194647 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -80,6 +80,8 @@ module ActionController #:nodoc: self.template_root = path_of_controller_root end + + deprecate :uses_component_template_root => 'Components are deprecated and will be removed in Rails 2.0.' end module InstanceMethods diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb index 57e3b21acf..c71de444dc 100644 --- a/actionpack/test/controller/components_test.rb +++ b/actionpack/test/controller/components_test.rb @@ -143,6 +143,8 @@ end class UsesComponentTemplateRootTest < Test::Unit::TestCase def test_uses_component_template_root - assert_equal './test/fixtures/', A::B::C::NestedController.uses_component_template_root + assert_deprecated 'uses_component_template_root' do + assert_equal './test/fixtures/', A::B::C::NestedController.uses_component_template_root + end end end |