diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-29 19:23:31 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-29 19:23:31 -0800 |
commit | 9e4621d6f7b7e864c6463da065f17b8ee27ecb81 (patch) | |
tree | 1fed9f750487916d70d4bd8d5c484ed0e001e852 /actionpack/test/abstract_unit.rb | |
parent | 8521cebbad465ae0acba36bda3fd202a898d194a (diff) | |
parent | 1182658e767d2db4a46faed35f0b1075c5dd9a88 (diff) | |
download | rails-9e4621d6f7b7e864c6463da065f17b8ee27ecb81.tar.gz rails-9e4621d6f7b7e864c6463da065f17b8ee27ecb81.tar.bz2 rails-9e4621d6f7b7e864c6463da065f17b8ee27ecb81.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r-- | actionpack/test/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index cbf7351172..51697fda2f 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -31,8 +31,8 @@ ActionController::Base.logger = nil ActionController::Routing::Routes.reload rescue nil FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') -ActionView::PathSet::Path.eager_load_templates! ActionController::Base.view_paths = FIXTURE_LOAD_PATH +ActionController::Base.view_paths.load def uses_mocha(test_name) yield |