aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/view_paths_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/view_paths_test.rb')
-rw-r--r--actionpack/test/controller/view_paths_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 9184ab1793..6c07c40c0a 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -46,10 +46,11 @@ class ViewLoadPathsTest < Test::Unit::TestCase
def test_template_root_deprecated
assert_deprecated(/template_root.*view_paths/) do
- TestController.template_root = LOAD_PATH_ROOT
+ TestController.template_root = 'foo/bar'
end
assert_deprecated(/template_root.*view_paths/) do
- assert_equal LOAD_PATH_ROOT, TestController.template_root
+ assert_equal 'foo/bar', TestController.template_root
+ assert_equal ['foo/bar', LOAD_PATH_ROOT], TestController.view_paths
end
end