diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
| commit | 24ab5665b2f12a589e96a4b742cc49c08bf0e9df (patch) | |
| tree | cbc703c96affe65fe8f0b24c6b6241286c820ba8 /activemodel/test | |
| parent | 5e2bd08023344f3fd4675e80203a10967ffe9000 (diff) | |
| download | rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.gz rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.bz2 rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.zip | |
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.
Diffstat (limited to 'activemodel/test')
| -rw-r--r-- | activemodel/test/cases/helper.rb | 7 | ||||
| -rw-r--r-- | activemodel/test/cases/tests_database.rb | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 8b1ab9e196..8bcbe54651 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -1,9 +1,4 @@ -require File.expand_path('../../../../bundler', __FILE__) - -lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) - -puts $LOAD_PATH.inspect +require File.expand_path('../../../../load_paths', __FILE__) require 'config' require 'active_model' 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 |