aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-01-31 16:33:06 -0800
committerCarl Lerche <carllerche@mac.com>2010-01-31 19:13:43 -0800
commit9f01dff9c203821bf4ac6d7b885f1d6b018d5c79 (patch)
tree5e7c4be2aec0f7e2bff6eac4e066a16dc4e269ad /activerecord
parent9bd0422dd7b4fc9f3bebf6301b144c6a5f35c26b (diff)
downloadrails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.gz
rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.bz2
rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.zip
Get rails tests running on bundler 0.9
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/helper.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index fa76e2d57a..9e8bfbbee8 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -1,14 +1,7 @@
-begin
- require File.expand_path('../../../../vendor/gems/environment', __FILE__)
-rescue LoadError
-end
-
-lib = File.expand_path('../../../lib', __FILE__)
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+require File.expand_path('../../../../load_paths', __FILE__)
require 'config'
-require 'rubygems'
require 'test/unit'
require 'stringio'