From f3f2e0b00d8b422fd5921fb709ac7a9570ad2a6a Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 13 Sep 2009 12:24:50 -0500
Subject: Move AS vendor support into bundler.

Run `rake bundle` before running tests.
---
 activesupport/test/abstract_unit.rb                 | 4 +++-
 activesupport/test/xml_mini/nokogiri_engine_test.rb | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'activesupport/test')

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
 
-- 
cgit v1.2.3