Get everything to work with stdlib minitest.

phiggins · Sep 19, 2012 · 9ee1ef6 · 9ee1ef6
1 parent 6e8f336
commit 9ee1ef6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Rakefile b/Rakefile
@@ -24,14 +24,12 @@ Hoe.spec 'heckle' do
   dependency 'ruby_parser', '~> 2.3.1'
   dependency 'ruby2ruby', '~> 1.3.0'
   dependency 'ZenTest',   '~> 4.7.0'
-  extra_dev_deps << ['minitest', '~> 2.3.0']
 
   multiruby_skip << "1.9" << "trunk"
 
   self.test_globs = ["test/test_*.rb"]
 
   self.testlib = :minitest
-  self.test_prelude = 'gem "minitest"'
 end
 
 # vim: syntax=ruby
diff --git a/lib/heckle_runner.rb b/lib/heckle_runner.rb
@@ -89,8 +89,8 @@ def self.parse_args argv
     p options if options[:debug]
 
     # TODO: Pass options to Heckle's initializer instead.
-    Heckle.debug = @options[:debug]
-    Heckle.timeout = @options[:timeout]
+    Heckle.debug = options[:debug]
+    Heckle.timeout = options[:timeout]
 
     options
   end
@@ -102,7 +102,7 @@ def initialize class_or_module, method, options={}
   end
 
   def run
-    Dir.glob(@options[:test_pattern]).each {|t| require File.expand_path(t) }
+    Dir.glob(@options[:test_pattern]).each {|t| load File.expand_path(t) }
 
     MiniTestHeckler.new(@class_or_module, @method, @options[:nodes]).validate
   end
@@ -116,11 +116,11 @@ def tests_pass?
       silence do
         MiniTest::Unit.runner = nil
 
-        result = MiniTest::Unit.new.run
+        MiniTest::Unit.new.run
 
-        p MiniTest::Unit.runner if Heckle.debug
+        runner = MiniTest::Unit.runner
 
-        result == 0
+        runner.failures == 0 && runner.errors == 0
       end
     end
 

diff --git a/test/fixtures/minitest_project/test/test_doubler_with_a_number.rb b/test/fixtures/minitest_project/test/test_doubler_with_a_number.rb
@@ -1,7 +1,7 @@
 require "minitest/autorun"
 require "doubler"
 
-class TestDoubler < MiniTest::Unit::TestCase
+class TestDoublerWithANumber < MiniTest::Unit::TestCase
   def setup
     @doubler = Doubler.new
   end

diff --git a/test/test_heckle_runner.rb b/test/test_heckle_runner.rb
@@ -22,14 +22,17 @@ def setup
     # See MiniTest's test/minitest/metametameta.rb
     @output = StringIO.new("")
     MiniTest::Unit::TestCase.reset
-    MiniTest::Unit.runner = nil
     MiniTest::Unit.output = @output
   end
 
   def teardown
     super
     Dir.chdir @old_pwd
     MiniTest::Unit.output = $stdout
+
+    MiniTest::Unit::TestCase.test_suites.each do |test|
+      Object.send :remove_const, test.to_s.to_sym
+    end
   end
 
   def test_run_with_full_coverage