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. --- activemodel/test/cases/tests_database.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activemodel/test/cases/tests_database.rb') diff --git a/activemodel/test/cases/tests_database.rb b/activemodel/test/cases/tests_database.rb index 4a392f609f..8ca54d2678 100644 --- a/activemodel/test/cases/tests_database.rb +++ b/activemodel/test/cases/tests_database.rb @@ -1,8 +1,6 @@ require 'logger' -activerecord_path = File.expand_path('../../../../activerecord/lib', __FILE__) -$:.unshift(activerecord_path) if File.directory?(activerecord_path) && !$:.include?(activerecord_path) - +$:.unshift(File.dirname(__FILE__) + '/../../../activerecord/lib') require 'active_record' module ActiveModel -- cgit v1.2.3