diff options
| -rw-r--r-- | activemodel/Gemfile | 11 | ||||
| -rw-r--r-- | activemodel/test/cases/helper.rb | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/activemodel/Gemfile b/activemodel/Gemfile new file mode 100644 index 0000000000..289d696792 --- /dev/null +++ b/activemodel/Gemfile @@ -0,0 +1,11 @@ +rails_root = Pathname.new(File.dirname(__FILE__)).join("..") + +Gem.sources.each { |uri| source uri } + +gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport") + +only :test do + gem "sqlite3-ruby" +end + +disable_system_gems 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' |