aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
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 /activeresource
parent9bd0422dd7b4fc9f3bebf6301b144c6a5f35c26b (diff)
downloadrails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.gz
rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.bz2
rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.zip
Get rails tests running on bundler 0.9
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/test/abstract_unit.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 1e71d5d0dd..2f43916521 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,10 +1,4 @@
-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 'rubygems'
require 'test/unit'