diff options
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index a11ff25e41..deb512eeb6 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -1,45 +1,23 @@ -# encoding: utf-8 - +require 'rubygems' require 'test/unit' +gem 'mocha', '>= 0.9.0' +require 'mocha' -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift File.dirname(__FILE__) require 'active_support' require 'active_support/test_case' -if RUBY_VERSION < '1.9' - $KCODE = 'UTF8' -end - -def uses_gem(gem_name, test_name, version = '> 0') - require 'rubygems' - gem gem_name.to_s, version - require gem_name.to_s +def uses_mocha(test_name, &block) yield -rescue LoadError - $stderr.puts "Skipping #{test_name} tests. `gem install #{gem_name}` and try again." end -# Wrap tests that use Mocha and skip if unavailable. -unless defined? uses_mocha - def uses_mocha(test_name, &block) - uses_gem('mocha', test_name, '>= 0.5.5', &block) - end -end - -unless defined? uses_memcached - def uses_memcached(test_name) - require 'memcache' - MemCache.new('localhost').stats - yield - rescue MemCache::MemCacheError - $stderr.puts "Skipping #{test_name} tests. Start memcached and try again." - end +def uses_memcached(test_name) + require 'memcache' + MemCache.new('localhost').stats + yield +rescue MemCache::MemCacheError + $stderr.puts "Skipping #{test_name} tests. Start memcached and try again." end -# Show backtraces for deprecated behavior for quicker cleanup. -ActiveSupport::Deprecation.debug = true - def with_kcode(code) if RUBY_VERSION < '1.9' begin @@ -52,3 +30,10 @@ def with_kcode(code) yield end end + +# Show backtraces for deprecated behavior for quicker cleanup. +ActiveSupport::Deprecation.debug = true + +if RUBY_VERSION < '1.9' + $KCODE = 'UTF8' +end |