diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-10-20 16:33:54 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-10-20 16:34:44 -0700 |
| commit | 4f6d6f7031a88b647814fc0154e6b69b636dc912 (patch) | |
| tree | 9752430c715e0b5d32713882c267d41554710246 /activerecord/test | |
| parent | a5c82a9dfb6d63bf90a3378da0b71d6ea592d7e3 (diff) | |
| download | rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.gz rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.bz2 rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.zip | |
Have all the tests running off a single Gemfile
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 63014c0297..871cfa6468 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -1,10 +1,9 @@ -$:.unshift(File.dirname(__FILE__) + '/../../lib') - -bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment" -if File.exist?("#{bundled}.rb") - require bundled -else - $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') +root = File.expand_path('../../../..', __FILE__) +begin + require "#{root}/vendor/gems/environment" +rescue LoadError + $:.unshift("#{root}/activesupport/lib") + $:.unshift("#{root}/activerecord/lib") end require 'config' |