diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
| commit | b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch) | |
| tree | 05ae73741366a390fd543b67f7080325c8d7525e /activesupport/test/abstract_unit.rb | |
| parent | 6f9e449830902319d3c0897e67d8ac9c89bff39d (diff) | |
| download | rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2 rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip | |
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'activesupport/test/abstract_unit.rb')
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index f364b7ecd8..4bc035c439 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -1,8 +1,6 @@ ORIG_ARGV = ARGV.dup -require 'bundler_helper' -ensure_requirable %w( builder memcache tzinfo ) - +require 'rubygems' require 'test/unit' ENV['NO_RELOAD'] = '1' @@ -14,7 +12,7 @@ require 'active_support/test_case' require 'active_support/ruby/shim' def uses_memcached(test_name) - require 'memcache' + require 'active_support/vendor/memcache' begin MemCache.new('localhost').stats yield |