Neuter both MiniTest::Unit and Test::Unit's overzealous test runners.

jpshackelford · Mar 21, 2011 · 72b695d · 72b695d
1 parent 4f47460
commit 72b695d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,8 @@
+== 0.10.2 (2011-03-21)
+
+=== Bugfixes
+* Neuter both MiniTest::Unit and Test::Unit's overzealous test runners. (Aslak Hellesøy)
+
 == 0.10.1 (2011-03-20)
 
 === New Features

diff --git a/...ber/core_ext/disable_mini_unit_autorun.rb → ...ext/disable_mini_and_test_unit_autorun.rb b/...ber/core_ext/disable_mini_unit_autorun.rb → ...ext/disable_mini_and_test_unit_autorun.rb
@@ -12,3 +12,14 @@ def run(*)
   end
 rescue LoadError => ignore
 end
+
+# Do the same for Test::Unit
+begin
+  require 'test/unit'
+  module Test::Unit
+    def self.run?
+      true
+    end
+  end
+rescue LoadError => ignore
+end
diff --git a/lib/cucumber/platform.rb b/lib/cucumber/platform.rb
@@ -4,7 +4,7 @@
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.10.1'
+  VERSION       = '0.10.2'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

diff --git a/lib/cucumber/runtime.rb b/lib/cucumber/runtime.rb
@@ -17,7 +17,7 @@ class Runtime
     include Runtime::UserInterface
 
     def initialize(configuration = Configuration.default)
-      require 'cucumber/core_ext/disable_mini_unit_autorun'
+      require 'cucumber/core_ext/disable_mini_and_test_unit_autorun'
       @current_scenario = nil
       @configuration = Configuration.parse(configuration)
       @support_code = SupportCode.new(self, @configuration)