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 /railties/test/abstract_unit.rb | |
| 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 'railties/test/abstract_unit.rb')
| -rw-r--r-- | railties/test/abstract_unit.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 77ef82856a..aa66dbb9be 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -1,15 +1,7 @@ ORIG_ARGV = ARGV.dup -root = File.expand_path('../../..', __FILE__) -begin - require "#{root}/vendor/gems/environment" -rescue LoadError - %w(activesupport activemodel activerecord actionpack actionmailer activeresource railties).each do |lib| - $:.unshift "#{root}/#{lib}/lib" - end -end - -$:.unshift "#{root}/railties/builtin/rails_info" +require File.expand_path("../../../load_paths", __FILE__) +$:.unshift File.expand_path("../../builtin/rails_info", __FILE__) require 'stringio' require 'test/unit' |