diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
| commit | 73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa (patch) | |
| tree | 2f1601292978a844226e16f3cef428ed760b9eb5 /actionpack/test/abstract_unit.rb | |
| parent | 8fe01de2e8753d045408ecde3178ab4e9192bf9a (diff) | |
| parent | 90c930f45c5c6766306929241462ffff8f67b86e (diff) | |
| download | rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.gz rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.bz2 rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.zip | |
Resolved conflict
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 70f6a28a9c..9db4cddd6a 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -22,7 +22,9 @@ ActiveSupport::Deprecation.debug = true ActionController::Base.logger = nil ActionController::Routing::Routes.reload rescue nil -FIXTURE_LOAD_PATH = ActionView::ViewLoadPaths::LoadPath.new(File.join(File.dirname(__FILE__), 'fixtures')) +FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') +ActionView::PathSet::Path.eager_load_templates! +ActionController::Base.view_paths = FIXTURE_LOAD_PATH # Wrap tests that use Mocha and skip if unavailable. def uses_mocha(test_name) |