mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
Removed the deprecated ActionController#Base.template_root/= methods (use ActionController#Base.view_paths/= instead) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user