aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-10-15 14:04:18 -0700
committerYehuda Katz <wycats@gmail.com>2009-10-15 14:04:18 -0700
commit02b76862e1ff8ceccb3cd48922ac178462e14892 (patch)
treee9fcf3984a2864ce25e6ce631baa71439f8794c5 /activemodel/test
parentcb8b0f4a5aac04a327a884b5413ccdb184715da8 (diff)
downloadrails-02b76862e1ff8ceccb3cd48922ac178462e14892.tar.gz
rails-02b76862e1ff8ceccb3cd48922ac178462e14892.tar.bz2
rails-02b76862e1ff8ceccb3cd48922ac178462e14892.zip
Bundle AMo
Diffstat (limited to 'activemodel/test')
-rw-r--r--activemodel/test/cases/helper.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 3c0bd15236..e54c85938b 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,5 +1,10 @@
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
+if File.exist?("#{bundled}.rb")
+ require bundled
+else
+ $:.unshift(File.dirname(__FILE__) + '/../../lib')
+ $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+end
require 'config'