diff options
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 13 | ||||
| -rw-r--r-- | actionpack/test/controller/view_paths_test.rb | 10 |
2 files changed, 1 insertions, 22 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 81db0ed467..a636f8b246 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -380,18 +380,7 @@ module ActionController #:nodoc: write_inheritable_attribute(:hidden_actions, hidden_actions | names.collect { |n| n.to_s }) end - # Deprecated. Use view_paths instead. - def template_root=(path) - prepend_view_path path - template_root - end - - # Deprecated. Use view_paths instead. - def template_root - view_paths.first - end - deprecate :template_root => :view_paths - + @@view_paths = {} # View load paths determine the bases from which template references can be made. So a call to diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb index 67048e76b0..83c4ab23e7 100644 --- a/actionpack/test/controller/view_paths_test.rb +++ b/actionpack/test/controller/view_paths_test.rb @@ -70,16 +70,6 @@ class ViewLoadPathsTest < Test::Unit::TestCase assert_equal "Hello overridden world!", @response.body end - def test_template_root_deprecated - assert_deprecated(/template_root.*view_paths/) do - TestController.template_root = 'foo/bar' - end - assert_deprecated(/template_root.*view_paths/) do - assert_equal 'foo/bar', TestController.template_root - assert_equal ['foo/bar', LOAD_PATH_ROOT], TestController.view_paths - end - end - def test_inheritance original_load_paths = ActionController::Base.view_paths |