test/test_helper.rb in imprint-1.3.0 vs test/test_helper.rb in imprint-1.4.0

@@ -1,18 +1,23 @@
 require 'rubygems'
 require 'simplecov'
-require 'test/unit'
+require 'minitest/autorun'
 require 'shoulda'
-require 'mocha/setup'
 require 'rack'
 
 SimpleCov.start do
   add_filter 'specs/ruby/1.9.1/gems/'
   add_filter '/test/'
   add_filter '/config/'
 end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-Mocha::Configuration.prevent(:stubbing_non_existent_method)
 
 require 'imprint'
+
+class Minitest::Test
+  def before_setup
+    # Remove any existing trace id before each test
+    Imprint::Tracer.set_trace_id nil
+  end
+end