Disable minitest autorun after loading support code.

@mattwynne @Kosmas @os97673 I think this is a better fix for cucumber/cucumber-rails#253 so we can revert cucumber/cucumber-rails@974c933
cucumber · Sep 23, 2013 · 6a209ae · 6a209ae · Kosmas · Sep 24, 2013
1 parent 1f843c0
commit 6a209ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/History.md b/History.md
@@ -1,6 +1,7 @@
 ##
 [v1.3.x-bugfix](https://github.com/cucumber/cucumber/compare/v1.3.8...v1.3.x-bugfix)
 
+* Disable minitest autorun after loading support files (@tooky)
 * Add `Ast::Table#map_column` for non-mutating column mapping (@tooky)
 * Remove deprecation warnings on `Ast::Table` (@tooky)
 

diff --git a/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb b/lib/cucumber/core_ext/disable_mini_and_test_unit_autorun.rb
diff --git a/lib/cucumber/runtime.rb b/lib/cucumber/runtime.rb
@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'multi_json'
+require 'multi_test'
 require 'gherkin/rubify'
 require 'gherkin/i18n'
 require 'cucumber/configuration'
@@ -20,7 +21,6 @@ class Runtime
     include Runtime::UserInterface
 
     def initialize(configuration = Configuration.default)
-      require 'cucumber/core_ext/disable_mini_and_test_unit_autorun'
       @current_scenario = nil
       @configuration = Configuration.parse(configuration)
       @support_code = SupportCode.new(self, @configuration)
@@ -40,6 +40,7 @@ def load_programming_language(language)
 
     def run!
       load_step_definitions
+      disable_minitest_test_unit_autorun
       fire_after_configuration_hook
 
       tree_walker = @configuration.build_tree_walker(self)
@@ -183,6 +184,10 @@ def load_step_definitions
       @support_code.load_files!(files)
     end
 
+    def disable_minitest_test_unit_autorun
+      MultiTest.disable_autorun
+    end
+
     def log
       Cucumber.logger
     end