From 27670363926ee341078aa69ae27204d7338037f5 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 19 Oct 2009 19:00:48 -0700 Subject: Use bundled env for tests only --- activerecord/test/cases/helper.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'activerecord/test/cases/helper.rb') diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index aa09c7061f..63014c0297 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -1,5 +1,11 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib') -$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') + +bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment" +if File.exist?("#{bundled}.rb") + require bundled +else + $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib') +end require 'config' -- cgit v1.2.3