diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
| commit | cda36a0731f14b33a920bf7e32255661e06f890a (patch) | |
| tree | 79ccba37953f9fe3055503be42b1610faa6d64ad /actionmailer/test/abstract_unit.rb | |
| parent | bd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff) | |
| parent | a115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff) | |
| download | rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2 rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionmailer/test/abstract_unit.rb')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index e84b3b0d23..af6f1bc92e 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -1,12 +1,9 @@ -root = File.expand_path('../../..', __FILE__) begin - require "#{root}/vendor/gems/environment" + require File.expand_path('../../../vendor/gems/environment', __FILE__) rescue LoadError - $:.unshift("#{root}/activesupport/lib") - $:.unshift("#{root}/actionpack/lib") end -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +lib = File.expand_path('../../lib', __FILE__) $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'rubygems' |