@@ -8,7 +8,7 @@ require 'yaml' require 'stringio' require 'test/unit' -gem 'mocha', '>= 0.9.0' +gem 'mocha', '>= 0.9.3' require 'mocha' begin actionpack/test/abstract_unit.rb @@ -1,7 +1,7 @@ require 'rubygems' require 'test/unit' -gem 'mocha', '>= 0.5.5' +gem 'mocha', '>= 0.9.3' require 'mocha' require 'active_model' activemodel/test/test_helper.rb @@ -1,22 +1,18 @@ -require 'test/unit/testcase' -require 'active_support/testing/setup_and_teardown' -require 'active_support/testing/assertions' -require 'active_support/testing/deprecation' -require 'active_support/testing/declarative' - begin - gem 'mocha', '>= 0.9.0' + gem 'mocha', '>= 0.9.3' require 'mocha' - - if defined?(MiniTest) - require 'active_support/testing/mocha_minitest_adapter' - end rescue LoadError # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh. Object.const_set :Mocha, Module.new Mocha.const_set :ExpectationError, Class.new(StandardError) end +require 'test/unit/testcase' +require 'active_support/testing/setup_and_teardown' +require 'active_support/testing/assertions' +require 'active_support/testing/deprecation' +require 'active_support/testing/declarative' + module ActiveSupport class TestCase < ::Test::Unit::TestCase if defined? MiniTest activesupport/lib/active_support/test_case.rb @@ -1,6 +1,6 @@ require 'rubygems' require 'test/unit' -gem 'mocha', '>= 0.9.0' +gem 'mocha', '>= 0.9.3' require 'mocha' $:.unshift "#{File.dirname(__FILE__)}/../lib" activesupport/test/abstract_unit.rb @@ -3,18 +3,15 @@ $:.unshift File.dirname(__FILE__) + "/../../actionpack/lib" $:.unshift File.dirname(__FILE__) + "/../lib" $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info" +require 'rubygems' require 'test/unit' +gem 'mocha', '>= 0.9.3' +require 'mocha' require 'stringio' require 'active_support' -# Wrap tests that use Mocha and skip if unavailable. def uses_mocha(test_name) - require 'rubygems' - gem 'mocha', '>= 0.5.5' - require 'mocha' yield -rescue LoadError - $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again." end if defined?(RAILS_ROOT) railties/test/abstract_unit.rb activesupport/lib/active_support/testing/mocha_minitest_adapter.rb 5d3712a81e502f46b2745d238d9bb76fcdb31f5b Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/e931012287df0bca83cae04d95c2e0835ae08758 e931012287df0bca83cae04d95c2e0835ae08758 2008-11-23T15:05:59-08:00 2008-11-23T14:48:36-08:00 Require Mocha >= 0.9.3 which includes a MiniTest adapter 46af916792dbd3a74883b4e1b572dd432cee4a59 Jeremy Kemper jeremy@bitsweat.net