diff options
Diffstat (limited to 'activemodel/test/cases')
-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 |