diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
| commit | 01ae99c681d31803f3a29f8305c9a041aa456660 (patch) | |
| tree | 7fdb9e32b743aeb254854371349cecfd2499defa /activeresource/test | |
| parent | d002826e54415a340e55fdbf363d005faebf8fc5 (diff) | |
| parent | fca32eb6c5b41e4f19a25b7b246c4a8a3d763667 (diff) | |
| download | rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.gz rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.bz2 rails-01ae99c681d31803f3a29f8305c9a041aa456660.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource/test')
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 4 | ||||
| -rw-r--r-- | activeresource/test/cases/base/load_test.rb | 1 |
2 files changed, 3 insertions, 2 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' diff --git a/activeresource/test/cases/base/load_test.rb b/activeresource/test/cases/base/load_test.rb index 189a4d81fe..7745a9439b 100644 --- a/activeresource/test/cases/base/load_test.rb +++ b/activeresource/test/cases/base/load_test.rb @@ -1,7 +1,6 @@ require 'abstract_unit' require "fixtures/person" require "fixtures/street_address" -require 'active_support/core_ext/symbol' require 'active_support/core_ext/hash/conversions' module Highrise |