diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-02-04 22:27:45 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-02-04 22:27:45 +0000 |
| commit | 92195e68a02715d29ef9d4b3bf66409c014f7174 (patch) | |
| tree | be9288b47df99e88a97416fd8707466fd8d549d1 /actionpack/test | |
| parent | 517bf0814e95922d8675b20abc70fa0536044bbe (diff) | |
| download | rails-92195e68a02715d29ef9d4b3bf66409c014f7174.tar.gz rails-92195e68a02715d29ef9d4b3bf66409c014f7174.tar.bz2 rails-92195e68a02715d29ef9d4b3bf66409c014f7174.zip | |
Fix issue with deprecation messing up #template_root= usage. Add #prepend_view_path and #append_view_path to allow modification of a copy of the
superclass' view_paths. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/view_paths_test.rb | 5 |
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 |