@@ -1,5 +1,6 @@ # This is not meant to be run by itself. It will be run by bacon_test.rb $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")) +require 'bacon' require 'mocha' module MetaTestOutput test/acceptance/bacon_spec.rb @@ -6,9 +6,6 @@ rescue LoadError # Bacon not available end -# force load so that MiniTest is suitably monkey-patched -load 'mocha.rb' - if defined?(Bacon) && Bacon::VERSION >= "1.1" class BaconRunner test/acceptance/bacon_test.rb 414cde3d50b78876cb912aad7d88ac5e31860460 James Mead floehopper james@floehopper.org http://github.com/floehopper/mocha/commit/3d133e74e74b1ae02c4195a1de6c0160f9c66e32 3d133e74e74b1ae02c4195a1de6c0160f9c66e32 2009-03-05T03:30:19-08:00 2009-03-05T03:30:19-08:00 Bacon should be loaded in bacon_spec.rb because this is run in a different process. Mocha should not be loaded in bacon_test.rb because it runs the Bacon spec in a different process and therefore Mocha is not needed. 05c65215fd9711409b005cab8628a363cc0cc623 James Mead floehopper james@floehopper.org