diff options
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | activesupport/test/bundler_helper.rb | 30 |
2 files changed, 2 insertions, 34 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 diff --git a/activesupport/test/bundler_helper.rb b/activesupport/test/bundler_helper.rb deleted file mode 100644 index 5f3e982f19..0000000000 --- a/activesupport/test/bundler_helper.rb +++ /dev/null @@ -1,30 +0,0 @@ -BUNDLER_ENV_FILE = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') - -def load_bundled_gems - load_bundled_gems! if File.exist?("#{BUNDLER_ENV_FILE}.rb") -end - -def load_bundled_gems! - puts "Checking if the bundled testing requirements are up to date..." - - result = system "gem bundle" - unless result - puts "The gem bundler is not installed. Installing." - system "gem install bundler" - system "gem bundle" - end - - require BUNDLER_ENV_FILE -end - -def ensure_requirable(libs) - load_bundled_gems - - begin - libs.each { |lib| require lib } - rescue LoadError => e - puts "Missing required libs to run test" - puts e.message - load_bundled_gems! - end -end |