diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-24 21:45:14 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-24 21:45:14 +1100 |
| commit | 5f2395041d1578433fa825ed5c6f26a201f2203d (patch) | |
| tree | 3b78531ae77a2173ad0df1103543bdfea0b1f60f /activeresource/test/abstract_unit.rb | |
| parent | 3a72923e27195983d37bdb39ef26b29cf03d3483 (diff) | |
| parent | e62e6d409986cd5c99234689aa49e3162d7b3a59 (diff) | |
| download | rails-5f2395041d1578433fa825ed5c6f26a201f2203d.tar.gz rails-5f2395041d1578433fa825ed5c6f26a201f2203d.tar.bz2 rails-5f2395041d1578433fa825ed5c6f26a201f2203d.zip | |
Merge branch 'master' of git://github.com/rails/rails into rails_master
Diffstat (limited to 'activeresource/test/abstract_unit.rb')
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index ee12f785b5..10849be20c 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -3,9 +3,11 @@ begin require "#{root}/vendor/gems/environment" rescue LoadError $:.unshift("#{root}/activesupport/lib") - $:.unshift("#{root}/activeresource/lib") end +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + require 'rubygems' require 'test/unit' require 'active_support' |