diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:24:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 12:24:50 -0500 |
| commit | f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a (patch) | |
| tree | ae71197fdcd8c87e784dd91e35aabcf13cc44407 /activesupport/test | |
| parent | 3b325d624ccb5b390356d61a3ba72f09709066a4 (diff) | |
| download | rails-f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a.tar.gz rails-f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a.tar.bz2 rails-f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a.zip | |
Move AS vendor support into bundler.
Run `rake bundle` before running tests.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 4 | ||||
| -rw-r--r-- | activesupport/test/xml_mini/nokogiri_engine_test.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index c2def8fe88..e06faadacb 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -1,6 +1,8 @@ ORIG_ARGV = ARGV.dup -require 'rubygems' +bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') +require bundler if File.exist?("#{bundler}.rb") + require 'test/unit' ENV['NO_RELOAD'] = '1' diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb index 7c3a591e63..1eeff73d32 100644 --- a/activesupport/test/xml_mini/nokogiri_engine_test.rb +++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb @@ -3,13 +3,11 @@ require 'active_support/xml_mini' require 'active_support/core_ext/hash/conversions' begin - gem 'nokogiri', '>= 1.1.1' -rescue Gem::LoadError + require 'nokogiri' +rescue LoadError # Skip nokogiri tests else -require 'nokogiri' - class NokogiriEngineTest < Test::Unit::TestCase include ActiveSupport |