diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
| commit | 9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78 (patch) | |
| tree | 5a711cacac76a83ad12551023da8524f94e7365b /actionpack/test/controller/view_paths_test.rb | |
| parent | dc7323efd34327c13d26031b68e51314c24360f6 (diff) | |
| parent | 9537fd0e3a7625afe4bee75d749647ca1837195a (diff) | |
| download | rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.gz rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.bz2 rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/test/controller/view_paths_test.rb')
| -rw-r--r-- | actionpack/test/controller/view_paths_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb index 0ac10634b2..c732d1c910 100644 --- a/actionpack/test/controller/view_paths_test.rb +++ b/actionpack/test/controller/view_paths_test.rb @@ -22,7 +22,7 @@ class ViewLoadPathsTest < ActionController::TestCase end def setup - TestController.view_paths = nil + # TestController.view_paths = nil @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -48,7 +48,7 @@ class ViewLoadPathsTest < ActionController::TestCase def assert_paths(*paths) controller = paths.first.is_a?(Class) ? paths.shift : @controller - assert_equal expand(paths), controller.view_paths.map(&:to_s) + assert_equal expand(paths), controller.view_paths.map { |p| p.to_s } end def test_template_load_path_was_set_correctly |