diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 10:51:19 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 10:51:19 +1100 |
| commit | d1eed079e1338249aa3b2881d07029ac4e71f4ed (patch) | |
| tree | 18088ca9388e1b7bd27fffea8cb41fa52b618c34 /activemodel | |
| parent | ddf2b4add33d5e54c5f5e7adacadbb50d3fa7b52 (diff) | |
| parent | b9edb0c60c11025311fb06f2e60b3354f1b6cb09 (diff) | |
| download | rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.gz rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.bz2 rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/test/cases/helper.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 917bb720d0..8bcbe54651 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -1,10 +1,4 @@ -begin - require File.expand_path('../../../../vendor/gems/environment', __FILE__) -rescue LoadError -end - -lib = File.expand_path('../../../lib', __FILE__) -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../../load_paths', __FILE__) require 'config' require 'active_model' |