lib/mocha/integration.rb @@ -1,56 +1,3 @@ require 'mocha_standalone' require 'mocha/configuration' - -if defined?(MiniTest::Unit::TestCase) && !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API) - require 'mocha/integration/mini_test' - - module MiniTest - class Unit - class TestCase - - include Mocha::API - - alias_method :run_before_mocha, :run - remove_method :run - - include Mocha::Integration::MiniTest::Version131AndAbove - - end - end - end -end - -require 'test/unit/testcase' -require 'mocha/integration/test_unit' - -unless Test::Unit::TestCase.ancestors.include?(Mocha::API) - module Test - module Unit - class TestCase - - include Mocha::API - - alias_method :run_before_mocha, :run - remove_method :run - - test_unit_version = begin - require 'test/unit/version' - Test::Unit::VERSION - rescue LoadError - '1.x' - end - - if test_unit_version == '2.0.0' - include Mocha::Integration::TestUnit::GemVersion200 - elsif test_unit_version >= '2.0.1' - include Mocha::Integration::TestUnit::GemVersion201AndAbove - elsif RUBY_VERSION < '1.8.6' - include Mocha::Integration::TestUnit::RubyVersion185AndBelow - else - include Mocha::Integration::TestUnit::RubyVersion186AndAbove - end - - end - end - end -end +require 'mocha/integration' lib/mocha.rb @@ -1 +1,21 @@ -require 'mocha/integration/mini_test/version_131_and_above' \ No newline at end of file +require 'mocha/api' + +if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API) + + require 'mocha/integration/mini_test/version_131_and_above' + + module MiniTest + class Unit + class TestCase + + include Mocha::API + + alias_method :run_before_mocha, :run + remove_method :run + + include Mocha::Integration::MiniTest::Version131AndAbove + + end + end + end +end lib/mocha/integration/mini_test.rb @@ -1,4 +1,40 @@ -require 'mocha/integration/test_unit/gem_version_200' -require 'mocha/integration/test_unit/gem_version_201_and_above' -require 'mocha/integration/test_unit/ruby_version_185_and_below' -require 'mocha/integration/test_unit/ruby_version_186_and_above' \ No newline at end of file +require 'mocha/api' + +if !Test::Unit::TestCase.ancestors.include?(Mocha::API) + + require 'mocha/integration/test_unit/gem_version_200' + require 'mocha/integration/test_unit/gem_version_201_and_above' + require 'mocha/integration/test_unit/ruby_version_185_and_below' + require 'mocha/integration/test_unit/ruby_version_186_and_above' + + module Test + module Unit + class TestCase + + include Mocha::API + + alias_method :run_before_mocha, :run + remove_method :run + + test_unit_version = begin + require 'test/unit/version' + Test::Unit::VERSION + rescue LoadError + '1.x' + end + + if test_unit_version == '2.0.0' + include Mocha::Integration::TestUnit::GemVersion200 + elsif test_unit_version >= '2.0.1' + include Mocha::Integration::TestUnit::GemVersion201AndAbove + elsif RUBY_VERSION < '1.8.6' + include Mocha::Integration::TestUnit::RubyVersion185AndBelow + else + include Mocha::Integration::TestUnit::RubyVersion186AndAbove + end + + end + end + end + +end \ No newline at end of file lib/mocha/integration/test_unit.rb @@ -1,15 +1,22 @@ require File.join(File.dirname(__FILE__), "acceptance_test_helper") begin + require 'rubygems' + gem 'minitest' +rescue Gem::LoadError + # MiniTest gem not available +end + +begin require 'minitest/unit' rescue LoadError # MiniTest not available end -# force load so that MiniTest is suitably monkey-patched -load 'mocha.rb' - if defined?(MiniTest) + + # monkey-patch MiniTest now that it has hopefully been loaded + require 'mocha/integration/mini_test' class MiniTestSampleTest < MiniTest::Unit::TestCase test/acceptance/minitest_test.rb da24f9e93640381973b1604b8a1ff3214b0831c9 James Mead james@floehopper.org http://github.com/floehopper/mocha/commit/213ce2187a84c25eeb7040238a8ce703c843f015 213ce2187a84c25eeb7040238a8ce703c843f015 2009-05-18T08:09:55-07:00 2009-05-18T08:09:55-07:00 Chad Humphries pointed out that in Ruby 1.9.1, if you are not using Test::Unit or MiniTest, Mocha will attempt to load and monkey-patch Test::Unit. Mocha will now only monkey-patch Test::Unit and/or MiniTest if they have already been loaded. MiniTest tests will now run in both Ruby 1.8.6 (with MiniTest gem) and in Ruby 1.9.1 (with MiniTest std lib). See Ligthouse ticket - http://floehopper.lighthouseapp.com/projects/22289/tickets/49. ac31e2fbca88a2b689b51a206405f79a1bc0b022 James Mead james@floehopper.org