diff options
author | Carl Lerche <carllerche@mac.com> | 2010-01-31 16:33:06 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-01-31 19:13:43 -0800 |
commit | 9f01dff9c203821bf4ac6d7b885f1d6b018d5c79 (patch) | |
tree | 5e7c4be2aec0f7e2bff6eac4e066a16dc4e269ad /activesupport/test | |
parent | 9bd0422dd7b4fc9f3bebf6301b144c6a5f35c26b (diff) | |
download | rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.gz rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.bz2 rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.zip |
Get rails tests running on bundler 0.9
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/abstract_unit.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index d91e0415c4..33be6f65bf 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -1,12 +1,4 @@ -ORIG_ARGV = ARGV.dup - -begin - require File.expand_path('../../../vendor/gems/environment', __FILE__) -rescue LoadError -end - -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../load_paths', __FILE__) require 'test/unit' require 'mocha' |