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.
---
 activerecord/test/cases/helper.rb              | 5 +----
 activerecord/test/cases/log_subscriber_test.rb | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 3254e7d800..9e8bfbbee8 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.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 'config'
 
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index f854499435..f0197ddf77 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -1,6 +1,3 @@
-railties_path = File.expand_path('../../../../railties/lib', __FILE__)
-$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
-
 require "cases/helper"
 require "models/developer"
 require "rails/log_subscriber/test_helper"
@@ -42,4 +39,4 @@ class LogSubscriberTest < ActiveSupport::TestCase
     assert_match /CACHE/, @logger.logged(:debug).last
     assert_match /SELECT .*?FROM .?developers.?/, @logger.logged(:debug).last
   end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.3