From 24ab5665b2f12a589e96a4b742cc49c08bf0e9df Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Tue, 23 Feb 2010 17:31:17 -0800 Subject: Revert "Fix test load paths for those not using bundler" This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path. --- activeresource/test/abstract_unit.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'activeresource/test/abstract_unit.rb') diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1c6f92cba4..1af535e811 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,7 +1,4 @@ -require File.expand_path('../../../bundler', __FILE__) - -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../load_paths', __FILE__) require 'rubygems' require 'test/unit' @@ -9,6 +6,7 @@ require 'active_resource' require 'active_support' require 'active_support/test_case' +$:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' require 'logger' -- cgit v1.2.3