From 4484f0bccf1b02ff1d05d7310afe2e572befce46 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 14 Oct 2009 20:59:45 -0700 Subject: Don't push siblings on load path if using bundled env --- actionmailer/test/abstract_unit.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index 3d4d0fb995..69af5d90a9 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,9 +1,15 @@ +bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment" +if File.exist?("#{bundled}.rb") + require bundled +else + $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" + $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib" +end + require 'rubygems' require 'test/unit' $:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib" -$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib" require 'action_mailer' require 'action_mailer/test_case' -- cgit v1.2.3