For testing, only load rubygems if mocha is missing

ec01cc45 · Joshua Peek · 27458464 · ec01cc45
隐藏空白更改
内联并排

Showing with 8 addition and 1 deletion

activesupport/test/abstract_unit.rb activesupport/test/abstract_unit.rb +8 -1

未找到文件。
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
 ORIG_ARGV = ARGV.dup

-require 'rubygems'
 require 'test/unit'

+begin
+  require 'mocha'
+rescue LoadError
+  $stderr.puts 'Loading rubygems'
+  require 'rubygems'
+  require 'mocha'
+end
+
 ENV['NO_RELOAD'] = '1'
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_support'