diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 19:00:48 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 19:00:48 -0700 |
| commit | 27670363926ee341078aa69ae27204d7338037f5 (patch) | |
| tree | 28cd7b073bf5f1f939547aca476e0a53e901ecce /activerecord/test/cases/helper.rb | |
| parent | c9cd10c4fa77aedb9116105d4d3c4d5684af4e1c (diff) | |
| download | rails-27670363926ee341078aa69ae27204d7338037f5.tar.gz rails-27670363926ee341078aa69ae27204d7338037f5.tar.bz2 rails-27670363926ee341078aa69ae27204d7338037f5.zip | |
Use bundled env for tests only
Diffstat (limited to 'activerecord/test/cases/helper.rb')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index aa09c7061f..63014c0297 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -1,5 +1,11 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') -$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') + +bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment" +if File.exist?("#{bundled}.rb") + require bundled +else + $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') +end require 'config' |