minitest 5.20.0 → 5.27.0

data/lib/minitest/test_task.rb

@@ -1,6 +1,12 @@
 require "shellwords"
 require "rbconfig"
-require "rake/tasklib"
+
+begin
+  require "rake/tasklib"
+rescue LoadError => e
+  warn e.message
+  return
+end
 
 module Minitest # :nodoc:
 
@@ -38,8 +44,16 @@ module Minitest # :nodoc:
     WINDOWS = RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ # :nodoc:
 
     ##
-    # Create several test-oriented tasks under +name+. Takes an
-    # optional block to customize variables.
+    # Create several test-oriented tasks under +name+ (default:
+    # "test"). Takes an optional block to customize variables.
+    # Examples:
+    #
+    #   Minitest::TestTask.create # named "test", all defaults
+    #
+    #   Minitest::TestTask.create do |t|
+    #     t.warning = false # my tests are noisy
+    #     t.framework = %(require_relative "./test/helper.rb")
+    #   end
 
     def self.create name = :test, &block
       task = new name
@@ -63,9 +77,18 @@ module Minitest # :nodoc:
 
     ##
     # The code to load the framework. Defaults to requiring
-    # minitest/autorun...
+    # minitest/autorun.
+    #
+    # If you have a test helper file that requires minitest/autorun
+    # and anything else your project standardizes on, then you'll
+    # probably want to change this to:
     #
-    # Why do I have this as an option?
+    #   Minitest::TestTask.create do |t|
+    #     t.framework = %(require_relative "./test/helper.rb")
+    #   end
+    #
+    # or something similar. NOTE: if you do this, then helper must
+    # require "minitest/autorun" at the top to start the tests.
 
     attr_accessor :framework
 
@@ -94,6 +117,11 @@ module Minitest # :nodoc:
 
     ##
     # Optional: Additional ruby to run before the test framework is loaded.
+    # Example:
+    #
+    #   Minitest::TestTask.create "test:cov" do |t|
+    #     t.test_prelude = %(require "simplecov")
+    #   end
 
     attr_accessor :test_prelude
 
@@ -114,7 +142,7 @@ module Minitest # :nodoc:
       self.test_globs   = ["test/**/test_*.rb",
                            "test/**/*_test.rb"]
       self.test_prelude = nil
-      self.verbose      = Rake.application.options.trace
+      self.verbose      = Rake.application.options.trace || Rake.verbose == true
       self.warning      = true
     end
 
@@ -144,7 +172,7 @@ module Minitest # :nodoc:
         ENV["N"] && ENV["N"].to_i > 0
 
       lib_extras = (ENV["MT_LIB_EXTRAS"] || "").split File::PATH_SEPARATOR
-      self.libs[0,0] = lib_extras
+      self.libs[0, 0] = lib_extras
 
       extra_args << "-n" << ENV["N"]                      if ENV["N"]
       extra_args << "-e" << ENV["X"]                      if ENV["X"]
@@ -163,7 +191,7 @@ module Minitest # :nodoc:
     def define # :nodoc:
       desc "Run the test suite. Use N, X, A, and TESTOPTS to add flags/args."
       task name do
-        ruby make_test_cmd, verbose:verbose
+        ruby make_test_cmd, verbose: verbose
       end
 
       desc "Print out the test command. Good for profiling and other tools."
@@ -177,7 +205,7 @@ module Minitest # :nodoc:
 
         # 3 seems to be the magic number... (tho not by that much)
         bad, good, n = {}, [], (ENV.delete("K") || 3).to_i
-        file = ENV.delete("F")
+        file = ENV.delete "F"
         times = {}
 
         tt0 = Time.now
@@ -238,7 +266,7 @@ module Minitest # :nodoc:
 
       task "#{name}:deps" => "#{name}:isolated" # now just an alias
 
-      desc "Show bottom 25 tests wrt time."
+      desc "Run the test suite and report the slowest 25 tests."
       task "#{name}:slow" do
         sh ["rake #{name} A=-v",
             "egrep '#test_.* s = .'",
@@ -262,11 +290,11 @@ module Minitest # :nodoc:
       runner = runner.join "; "
 
       args  = []
-      args << "-I#{libs.join(File::PATH_SEPARATOR)}" unless libs.empty?
+      args << "-I#{libs.join File::PATH_SEPARATOR}" unless libs.empty?
       args << "-w" if warning
-      args << '-e'
+      args << "-e"
       args << "'#{runner}'"
-      args << '--'
+      args << "--"
       args << extra_args.map(&:shellescape)
 
       args.join " "
@@ -275,23 +303,17 @@ module Minitest # :nodoc:
 end
 
 class Work < Queue # :nodoc:
-  def initialize jobs = [] # :nodoc:
-    super()
-
-    jobs.each do |job|
-      self << job
-    end
-
+  def initialize jobs # :nodoc:
+    super
     close
   end
 end
 
 class Integer # :nodoc:
-  def threads_do(jobs) # :nodoc:
-    require "thread"
+  def threads_do jobs # :nodoc:
     q = Work.new jobs
 
-    self.times.map {
+    Array.new(self) {
       Thread.new do
         while job = q.pop # go until quit value
           yield job

data/lib/minitest/unit.rb

@@ -11,7 +11,7 @@ unless defined?(Minitest) then
   module Minitest # :nodoc:
   end
   MiniTest = Minitest # :nodoc: # prevents minitest.rb from requiring back to us
-  require "minitest"
+  require_relative "../minitest"
 end
 
 MiniTest = Minitest unless defined?(MiniTest)