From 24ab5665b2f12a589e96a4b742cc49c08bf0e9df Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
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.
---
 railties/test/abstract_unit.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'railties/test/abstract_unit.rb')

diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 2ac165fc49..aa66dbb9be 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,13 +1,8 @@
 ORIG_ARGV = ARGV.dup
 
-require File.expand_path("../../../bundler", __FILE__)
+require File.expand_path("../../../load_paths", __FILE__)
 $:.unshift File.expand_path("../../builtin/rails_info", __FILE__)
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
-require 'edge_rails'
-
 require 'stringio'
 require 'test/unit'
 require 'fileutils'
-- 
cgit v1.2.3