diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 20:59:45 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 20:59:45 -0700 |
| commit | 4484f0bccf1b02ff1d05d7310afe2e572befce46 (patch) | |
| tree | f0044be5443781306161f9f5e5ea30c618b5cc82 /actionmailer | |
| parent | 5b8e6279acaa46f22118122c49350e1b08c7371a (diff) | |
| download | rails-4484f0bccf1b02ff1d05d7310afe2e572befce46.tar.gz rails-4484f0bccf1b02ff1d05d7310afe2e572befce46.tar.bz2 rails-4484f0bccf1b02ff1d05d7310afe2e572befce46.zip | |
Don't push siblings on load path if using bundled env
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 10 |
1 files changed, 8 insertions, 2 deletions
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' |