diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-16 11:56:51 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-16 11:56:51 -0600 |
| commit | 7ee5843c3cedfe36a680d5b28aa31eef45296c50 (patch) | |
| tree | d399cb71b2533ec353ebbb5cc19a0c0902da1987 /actionmailer/test | |
| parent | 1ab35020c152575c84d4ca95842d55be307e1fee (diff) | |
| download | rails-7ee5843c3cedfe36a680d5b28aa31eef45296c50.tar.gz rails-7ee5843c3cedfe36a680d5b28aa31eef45296c50.tar.bz2 rails-7ee5843c3cedfe36a680d5b28aa31eef45296c50.zip | |
Fully expand relative rails framework paths and make sure we aren't
adding any to the load path more than once.
Diffstat (limited to 'actionmailer/test')
| -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' |