diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-26 19:10:13 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-26 19:10:13 -0700 |
| commit | 4b921a5bdf952061bca1d1eb9a0b05c4160cae5a (patch) | |
| tree | 3665e07b9c338a10addb8fc713a31bf0673da677 | |
| parent | f3f5f40e446b75ab5080b11263e9875fddc756b0 (diff) | |
| download | rails-4b921a5bdf952061bca1d1eb9a0b05c4160cae5a.tar.gz rails-4b921a5bdf952061bca1d1eb9a0b05c4160cae5a.tar.bz2 rails-4b921a5bdf952061bca1d1eb9a0b05c4160cae5a.zip | |
Hack in env variable setting for Dependencies.mechanism
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 61823fdeb2..ba515aaeec 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -21,7 +21,7 @@ module ActiveSupport #:nodoc: # Should we load files or require them? mattr_accessor :mechanism - self.mechanism = :load + self.mechanism = ENV['NO_RELOAD'] ? :require : :load # The set of directories from which we may automatically load files. Files # under these directories will be reloaded on each request in development mode, diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index a0c0c59e47..c997bcbb66 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -4,6 +4,7 @@ require 'test/unit' gem 'mocha', '>= 0.9.5' require 'mocha' +ENV['NO_RELOAD'] = '1' $:.unshift "#{File.dirname(__FILE__)}/../lib" require 'active_support' require 'active_support/test_case' |