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

(limited to 'activeresource')

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'
diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb
index 45eb4da8a4..c25dd4ebc5 100644
--- a/activeresource/test/cases/log_subscriber_test.rb
+++ b/activeresource/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 "abstract_unit"
 require "fixtures/person"
 require "rails/log_subscriber/test_helper"
@@ -32,4 +29,4 @@ class LogSubscriberTest < ActiveSupport::TestCase
     assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0]
     assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1]
   end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.3