spec 5.0.19 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5038d9de846696ce5a2f21796e96617307552236
-  data.tar.gz: ccc9abc1332c91214faa8d35e3c89cb22976ea55
+  metadata.gz: 1862a5647d9edb8c300deb03b6bf21cb4d8d85e1
+  data.tar.gz: 8184a4a78143f820d7132ea83f9d0186e332030f
 SHA512:
-  metadata.gz: 7da9864a71d17f68ce58d957099918028d03b19a4bcc80961b4aa5397e14867db34c18f44a8a7ddb0dc5681f84b03b9547a0c59b49e98454cf58c9c7cafea731
-  data.tar.gz: 18330a6e213562aed882a7a31bec0d7b80607c3077375fa3fe62adf46d109debce732098ebe926d2fb843b7325116ac002009e210aa41412924c6adffc12ed90
+  metadata.gz: 6563324e7b8f500574e347eb5e8abb9a61a08d80d5b986435848af1a3792cd63344d503c6c63ad591433f1d3d478e9be6ca53514199b13b36a3022697677d3e3
+  data.tar.gz: 2389dde6619ec0fd846ba0fe8e17e0f905e7d4be40b6f4f5198e06187b766f613727375aff3839a12472077b9524adf8fad708afd0a24a2a971f07966b396562

data/History.txt

@@ -1,3 +1,87 @@
+=== 5.3.3 / 2014-04-14
+
+* 1 bug fix:
+
+  * Fixed using expectations w/ DSL in Test class w/o describe. (blowmage+others)
+
+=== 5.3.2 / 2014-04-02
+
+* 1 bug fix:
+
+  * Fixed doco on Assertions.assertions. (xaviershay)
+
+=== 5.3.1 / 2014-03-14
+
+* 1 minor enhancement:
+
+  * Modified verbage on bad 'let' names to be more helpful. (Archytaus)
+
+* 1 bug fix:
+
+  * Fixed 2 cases still using MiniTest. (mikesea)
+
+=== 5.3.0 / 2014-02-25
+
+* 1 minor enhancement:
+
+  * Mocked methods can take a block to verify state. Seattle.rb 12 bday present from ernie! Thanks!!
+
+=== 5.2.3 / 2014-02-10
+
+* 1 bug fix:
+
+  * Fixed Spec#let check to allow overriding of other lets. (mvz)
+
+=== 5.2.2 / 2014-01-22
+
+* 1 minor enhancement:
+
+  * Spec#let raises ArgumentError if you override _any_ instance method (except subject). (rynr)
+
+* 1 bug fix:
+
+  * Fixed up benchmark spec doco and added a test to demonstrate. (bhenderson)
+
+=== 5.2.1 / 2014-01-07
+
+* 1 bug fix:
+
+  * Properly deal with horrible mix of runtime load errors + other at_exit handlers. (dougo/chqr)
+
+=== 5.2.0 / 2013-12-13
+
+* 1 minor enhancement:
+
+  * Change expectations to allow calling most on procs (but not calling the proc). (bhenderson+others)
+
+=== 5.1.0 / 2013-12-05
+
+* 1 minor enhancement:
+
+  * Use a Queue for scheduling parallel tests. (tenderlove)
+
+* 1 bug fix:
+
+  * Fixed misspelling in doco. (amatsuda)
+
+=== 5.0.8 / 2013-09-20
+
+* 1 bug fix:
+
+  * Fixed siginfo handler by rearranging reporters and fixing to_s. (tenderlove)
+
+=== 5.0.7 / 2013-09-05
+
+* 2 minor enhancements:
+
+  * Added clarification about the use of thread local variables in expectations. (jemc)
+  * Added extra message about skipped tests, if any. Disable globally with $MT_NO_SKIP_MSG.
+
+* 2 bug fixes:
+
+  * Only require minitest, not minitest/autorun in pride_plugin. (judofyr)
+  * Require rubygems in load_plugins in case you're not using minitest/autorun.
+
 === 5.0.6 / 2013-06-28
 
 * 3 minor enhancements:
@@ -10,6 +94,13 @@
 
   * Fixed missing require in minitest/test. (erikh)
 
+=== 4.7.5 / 2013-06-21
+
+* 2 bug fixes:
+
+  * Fix Spec#describe_stack to be thread local.
+  * Fix multithreaded test failures by defining Time local to mock test namespace
+
 === 5.0.5 / 2013-06-20
 
 * 6 bug fixes:
@@ -128,6 +219,21 @@ Minitest 5:
   * Removed Minitest::Test.synchronize (phiggins)
   * Upon loading minitest/parallel_each, record, capture_io and capture_subprocess_io are doped with synchronization code. (phiggins)
 
+=== 4.7.4 / 2013-05-01
+
+This is probably the last release of the 4.x series. It will be merged
+to ruby and will be put into maintenance mode there.
+
+I'm not set in stone on this, but at this point further development of
+minitest (5+) will be gem-only. It is just too hard to work w/in
+ruby-core w/ test-unit compatibility holding minitest development
+back.
+
+* 2 minor enhancements:
+
+  * Added count/size to ParallelEach to fix use w/in stdlib's test/unit. :( (btaitelb)
+  * Allow disabling of info_signal handler in runner. (erikh)
+
 === 4.7.3 / 2013-04-20
 
 * 1 bug fix:

data/Manifest.txt

@@ -12,7 +12,7 @@ lib/minitest/benchmark.rb
 lib/minitest/expectations.rb
 lib/minitest/hell.rb
 lib/minitest/mock.rb
-lib/minitest/parallel_each.rb
+lib/minitest/parallel.rb
 lib/minitest/pride.rb
 lib/minitest/pride_plugin.rb
 lib/minitest/spec.rb

data/README.txt

@@ -3,6 +3,7 @@
 home :: https://github.com/seattlerb/minitest
 rdoc :: http://docs.seattlerb.org/minitest
 vim  :: https://github.com/sunaku/vim-ruby-minitest
+emacs:: https://github.com/arthurnn/minitest-emacs
 
 == DESCRIPTION:
 
@@ -90,6 +91,8 @@ Given that you'd like to test the following class:
 
 === Unit tests
 
+Define your tests as methods beginning with `test_`.
+
   require "minitest/autorun"
 
   class TestMeme < Minitest::Test
@@ -366,62 +369,105 @@ you want to extend your test using setup/teardown via a module, just
 make sure you ALWAYS call super. before/after automatically call super
 for you, so make sure you don't do it twice.
 
+== Prominent Projects using Minitest:
+
+* arel
+* journey
+* mime-types
+* nokogiri
+* rails (active_support et al)
+* rake
+* rdoc
+* ...and of course, everything from seattle.rb...
+
 == Known Extensions:
 
-capybara_minitest_spec      :: Bridge between Capybara RSpec matchers and MiniTest::Spec expectations (e.g. page.must_have_content("Title")).
+capybara_minitest_spec      :: Bridge between Capybara RSpec matchers and
+                               Minitest::Spec expectations (e.g.
+                               page.must_have_content("Title")).
 minispec-metadata           :: Metadata for describe/it blocks
                                (e.g. `it "requires JS driver", js: true do`)
 minitest-ansi               :: Colorize minitest output with ANSI colors.
-minitest-around             :: Around block for minitest. An alternative to setup/teardown dance.
-minitest-capistrano         :: Assertions and expectations for testing Capistrano recipes
-minitest-capybara           :: Capybara matchers support for minitest unit and spec
+minitest-around             :: Around block for minitest. An alternative to
+                               setup/teardown dance.
+minitest-capistrano         :: Assertions and expectations for testing
+                               Capistrano recipes.
+minitest-capybara           :: Capybara matchers support for minitest unit and
+                               spec.
 minitest-chef-handler       :: Run Minitest suites as Chef report handlers
-minitest-ci                 :: CI reporter plugin for MiniTest.
-minitest-colorize           :: Colorize MiniTest output and show failing tests instantly.
-minitest-context            :: Defines contexts for code reuse in MiniTest
+minitest-ci                 :: CI reporter plugin for Minitest.
+minitest-colorize           :: Colorize Minitest output and show failing tests
+                               instantly.
+minitest-context            :: Defines contexts for code reuse in Minitest
                                specs that share common expectations.
 minitest-debugger           :: Wraps assert so failed assertions drop into
                                the ruby debugger.
-minitest-display            :: Patches MiniTest to allow for an easily configurable output.
-minitest-emoji              :: Print out emoji for your test passes, fails, and skips.
-minitest-english            :: Semantically symmetric aliases for assertions and expectations.
+minitest-display            :: Patches Minitest to allow for an easily
+                               configurable output.
+minitest-documentation      :: Minimal documentation format inspired by rspec's.
+minitest-doc_reporter       :: Detailed output inspired by rspec's documentation
+                               format.
+minitest-emoji              :: Print out emoji for your test passes, fails, and
+                               skips.
+minitest-english            :: Semantically symmetric aliases for assertions and
+                               expectations.
 minitest-excludes           :: Clean API for excluding certain tests you
                                don't want to run under certain conditions.
-minitest-filesystem         :: Adds assertion and expectation to help testing filesystem contents.
-minitest-firemock           :: Makes your MiniTest mocks more resilient.
-minitest-great_expectations :: Generally useful additions to minitest's assertions and expectations
+minitest-filesystem         :: Adds assertion and expectation to help testing
+                               filesystem contents.
+minitest-firemock           :: Makes your Minitest mocks more resilient.
+minitest-great_expectations :: Generally useful additions to minitest's
+                               assertions and expectations.
 minitest-growl              :: Test notifier for minitest via growl.
 minitest-implicit-subject   :: Implicit declaration of the test subject.
 minitest-instrument         :: Instrument ActiveSupport::Notifications when
-                               test method is executed
-minitest-instrument-db      :: Store information about speed of test
-                               execution provided by minitest-instrument in database
+                               test method is executed.
+minitest-instrument-db      :: Store information about speed of test execution
+                               provided by minitest-instrument in database.
 minitest-libnotify          :: Test notifier for minitest via libnotify.
-minitest-line               :: Run test at line number
-minitest-macruby            :: Provides extensions to minitest for macruby UI testing.
-minitest-matchers           :: Adds support for RSpec-style matchers to minitest.
+minitest-line               :: Run test at line number.
+minitest-macruby            :: Provides extensions to minitest for macruby UI
+                               testing.
+minitest-matchers           :: Adds support for RSpec-style matchers to
+                               minitest.
 minitest-metadata           :: Annotate tests with metadata (key-value).
-minitest-mongoid            :: Mongoid assertion matchers for MiniTest
-minitest-must_not           :: Provides must_not as an alias for wont in MiniTest
-minitest-nc                 :: Test notifier for minitest via Mountain Lion's Notification Center
-minitest-predicates         :: Adds support for .predicate? methods
-minitest-rails              :: MiniTest integration for Rails 3.x
-minitest-rails-capybara     :: Capybara integration for MiniTest::Rails
-minitest-reporters          :: Create customizable MiniTest output formats
-minitest-should_syntax      :: RSpec-style +x.should == y+ assertions for MiniTest
-minitest-shouldify          :: Adding all manner of shoulds to MiniTest (bad idea)
-minitest-spec-context       :: Provides rspec-ish context method to MiniTest::Spec
-minitest-spec-expect        :: Expect syntax for MiniTest::Spec - expect(sequences).to_include :celery_man
-minitest-spec-magic         :: Minitest::Spec extensions for Rails and beyond
-minitest-spec-rails         :: Drop in MiniTest::Spec superclass for ActiveSupport::TestCase.
-minitest-stub-const         :: Stub constants for the duration of a block
-minitest-tags               :: add tags for minitest
+minitest-mongoid            :: Mongoid assertion matchers for Minitest.
+minitest-must_not           :: Provides must_not as an alias for wont in
+                               Minitest.
+minitest-nc                 :: Test notifier for minitest via Mountain Lion's
+                               Notification Center.
+minitest-predicates         :: Adds support for .predicate? methods.
+minitest-rails              :: Minitest integration for Rails 3.x.
+minitest-rails-capybara     :: Capybara integration for Minitest::Rails.
+minitest-reporters          :: Create customizable Minitest output formats.
+minitest-rg                 :: Colored red/green output for Minitest.
+minitest-rspec_mocks        :: Use RSpec Mocks with Minitest.
+minitest-should_syntax      :: RSpec-style +x.should == y+ assertions for
+                               Minitest.
+minitest-shouldify          :: Adding all manner of shoulds to Minitest (bad
+                               idea)
+minitest-spec-context       :: Provides rspec-ish context method to
+                               Minitest::Spec.
+minitest-spec-expect        :: Expect syntax for Minitest::Spec (e.g.
+                               expect(sequences).to_include :celery_man).
+minitest-spec-magic         :: Minitest::Spec extensions for Rails and beyond.
+minitest-spec-rails         :: Drop in Minitest::Spec superclass for
+                               ActiveSupport::TestCase.
+minitest-stub_any_instance  :: Stub any instance of a method on the given class
+                               for the duration of a block.
+minitest-stub-const         :: Stub constants for the duration of a block.
+minitest-tags               :: Add tags for minitest.
+minitest-vcr                :: Automatic cassette managment with Minitest::Spec
+                               and VCR.
 minitest-wscolor            :: Yet another test colorizer.
 minitest_owrapper           :: Get tests results as a TestResult object.
 minitest_should             :: Shoulda style syntax for minitest test::unit.
-minitest_tu_shim            :: minitest_tu_shim bridges between test/unit and minitest.
-mongoid-minitest            :: MiniTest matchers for Mongoid.
-pry-rescue                  :: A pry plugin w/ minitest support. See pry-rescue/minitest.rb.
+minitest_tu_shim            :: Bridges between test/unit and minitest.
+mongoid-minitest            :: Minitest matchers for Mongoid.
+pry-rescue                  :: A pry plugin w/ minitest support. See
+                               pry-rescue/minitest.rb.
+rspec2minitest              :: Easily translate any RSpec matchers to Minitest
+                               assertions and expectations.
 
 == Unknown Extensions:
 

data/Rakefile

@@ -1,5 +1,3 @@
-# -*- ruby -*-
-
 require 'rubygems'
 require 'hoe'
 
@@ -8,63 +6,11 @@ Hoe.plugin :seattlerb
 Hoe.spec 'minitest' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  self.rubyforge_name = "bfts"
-  self.testlib = :minitest
-  self.licenses = [ 'MIT' ]
-end
+  license "MIT"
 
-desc "Find missing expectations"
-task :specs do
-  $:.unshift "lib"
-  require "minitest/unit"
-  require "minitest/spec"
-
-  pos_prefix, neg_prefix = "must", "wont"
-  skip_re = /^(must|wont)$|wont_(throw)|must_(block|not?_|nothing|raise$)/x
-  dont_flip_re = /(must|wont)_(include|respond_to)/
-
-  map = {
-    /(must_throw)s/                        => '\1',
-    /(?!not)_same/                         => '_be_same_as',
-    /_in_/                                 => '_be_within_',
-    /_operator/                            => '_be',
-    /_includes/                            => '_include',
-    /(must|wont)_(.*_of|nil|silent|empty)/ => '\1_be_\2',
-    /must_raises/                          => 'must_raise',
-  }
-
-  expectations = Minitest::Expectations.public_instance_methods.map(&:to_s)
-  assertions   = Minitest::Assertions.public_instance_methods.map(&:to_s)
-
-  assertions.sort.each do |assertion|
-    expectation = case assertion
-                  when /^assert/ then
-                    assertion.sub(/^assert/, pos_prefix.to_s)
-                  when /^refute/ then
-                    assertion.sub(/^refute/, neg_prefix.to_s)
-                  end
-
-    next unless expectation
-    next if expectation =~ skip_re
-
-    regexp, replacement = map.find { |re, _| expectation =~ re }
-    expectation.sub! regexp, replacement if replacement
-
-    next if expectations.include? expectation
-
-    args = [assertion, expectation].map(&:to_sym).map(&:inspect)
-    args << :reverse if expectation =~ dont_flip_re
-
-    puts
-    puts "##"
-    puts "# :method: #{expectation}"
-    puts "# See Minitest::Assertions##{assertion}"
-    puts
-    puts "infect_an_assertion #{args.join ", "}"
-  end
+  self.testlib = :minitest
 end
 
-# vim: syntax=Ruby
 
 # from https://github.com/bootstraponline/gem_template
 # todo: publish gem_template as a gem
@@ -73,6 +19,7 @@ end
 require 'rubygems'
 require 'rake'
 require 'date'
+require_relative 'lib/minitest'
 
 # Defines gem name.
 def repo_name; 'spec' end # rubygems.org name

data/lib/minitest.rb

@@ -1,12 +1,14 @@
 require "optparse"
-require 'chronic_duration'
+require "thread"
+require "mutex_m"
+require "minitest/parallel"
 
 ##
 # :include: README.txt
 
 module Minitest
-  VERSION = '5.0.19' # :nodoc:
-  DATE = '2013-08-19' # :nodoc:
+  VERSION = '5.3.3' # :nodoc:
+  DATE = '2014-04-21' # :nodoc:
 
   @@installed_at_exit ||= false
   @@after_run = []
@@ -14,6 +16,12 @@ module Minitest
 
   mc = (class << self; self; end)
 
+  ##
+  # Parallel test executor
+
+  mc.send :attr_accessor, :parallel_executor
+  self.parallel_executor = Parallel::Executor.new((ENV['N'] || 2).to_i)
+
   ##
   # Filter object for backtraces.
 
@@ -36,7 +44,7 @@ module Minitest
 
   def self.autorun
     at_exit {
-      next if $! and not $!.kind_of? SystemExit
+      next if $! and not ($!.kind_of? SystemExit and $!.success?)
 
       exit_code = nil
 
@@ -72,6 +80,8 @@ module Minitest
 
     seen = {}
 
+    require "rubygems" unless defined? Gem
+
     Gem.find_files("minitest/*_plugin.rb").each do |plugin_path|
       name = File.basename plugin_path, "_plugin.rb"
 
@@ -92,11 +102,13 @@ module Minitest
   #
   #   Minitest.autorun
   #     Minitest.run(args)
-  #       __run(reporter, options)
+  #       Minitest.__run(reporter, options)
   #         Runnable.runnables.each
   #           runnable.run(reporter, options)
   #             self.runnable_methods.each
-  #               self.new(runnable_method).run
+  #               self.run_one_method(self, runnable_method, reporter)
+  #                 Minitest.run_one_method(klass, runnable_method, reporter)
+  #                   klass.new(runnable_method).run
 
   def self.run args = []
     self.load_plugins
@@ -104,8 +116,8 @@ module Minitest
     options = process_args args
 
     reporter = CompositeReporter.new
-    reporter << ProgressReporter.new(options[:io], options)
     reporter << SummaryReporter.new(options[:io], options)
+    reporter << ProgressReporter.new(options[:io], options)
 
     self.reporter = reporter # this makes it available to plugins
     self.init_plugins options
@@ -113,6 +125,7 @@ module Minitest
 
     reporter.start
     __run reporter, options
+    self.parallel_executor.shutdown
     reporter.report
 
     reporter.passed?
@@ -126,88 +139,22 @@ module Minitest
   # loaded if a Runnable calls parallelize_me!.
 
   def self.__run reporter, options
-    Runnable.runnables.each do |runnable|
-      runnable.run reporter, options
-    end
-  end
-
-  ##
-  # Trace file source to :io (default $stdout)
-  #
-  # spec_opts = {}
-  #
-  # @param :trace [Array<String>] the files to trace
-  # @param :io [IO] io to print to
-  def self.trace_specs spec_opts
-    targets = []
-    files = {}
-    last_file = ''
-    last_line = -1
-
-    files_to_trace = spec_opts.fetch(:trace, []);
-    io = spec_opts.fetch(:io, $stdout)
-    color = spec_opts.fetch(:color, "\e[32m") # ANSI.green default
-    # target only existing readable files
-    files_to_trace.each do |f|
-      targets.push(File.expand_path(f)) if File.exists?(f) && File.readable?(f)
-    end
-    return if targets.empty?
-
-    set_trace_func(lambda do |event, file, line, id, binding, classname|
-      return unless targets.include? file
-
-      # never repeat a line
-      return if file == last_file && line == last_line
-
-      file_sym = file.intern
-      files[file_sym] = IO.readlines(file) if files[file_sym].nil?
-      lines = files[file_sym]
-
-      # arrays are 0 indexed and line numbers start at one.
-      io.print color if color # ANSI code
-      io.puts lines[ line - 1]
-      io.print "\e[0m" if color # ANSI.clear
-
-      last_file = file
-      last_line = line
-
-    end)
-  end
-
-  def self.on_exit exit_code
-    @@after_run.reverse_each(&:call)
-    exit exit_code || false
-  end
-
-  ##
-  # Run specs. Does not print dots (ProgressReporter)
-  #
-  # spec_opts
-  # @param :io [Array<String>] defaults to $stdout
-  # @param :trace [Array<String>] files to trace
-
-  def self.run_specs spec_opts={}
-    options = { :io => spec_opts.fetch(:io, $stdout) }
-    reporter = Minitest::CompositeReporter.new
-    reporter << Minitest::SummaryReporter.new(options[:io], options)
-    reporter.start
-
-    at_exit { on_exit reporter.passed? }
-    # exit on ctrl+c to trigger at_exit
-    trap('SIGINT') { exit }
-
-    trace_specs spec_opts
-
-    begin
-      Minitest.__run reporter, options
-      reporter.reporters.each { |r| r.report }
-    rescue Minitest::Runnable::ExitAfterFirstFail
-      # Minitest calls .report on exception
-    end
+    suites = Runnable.runnables
+    parallel, serial = suites.partition { |s| s.test_order == :parallel }
+
+    # If we run the parallel tests before the serial tests, the parallel tests
+    # could run in parallel with the serial tests. This would be bad because
+    # the serial tests won't lock around Reporter#record. Run the serial tests
+    # first, so that after they complete, the parallel tests will lock when
+    # recording results.
+    serial.map { |suite| suite.run reporter, options } +
+      parallel.map { |suite| suite.run reporter, options }
   end
 
   def self.process_args args = [] # :nodoc:
-    options = { :io => $stdout }
+    options = {
+               :io => $stdout,
+              }
     orig_args = args.dup
 
     OptionParser.new do |opts|
@@ -323,27 +270,12 @@ module Minitest
 
     reset
 
-    class ExitAfterFirstFail < RuntimeError; end
-
-    def self.check_failures result, reporter
-      # skip is not a failure.
-      true_fails = result.failures.reject { |obj| obj.class == Minitest::Skip }
-      if !true_fails.empty?
-        begin
-          reporter.reporters.each { |r| r.report }
-        ensure
-          raise ExitAfterFirstFail
-        end
-      end
-    end
-
     ##
     # Responsible for running all runnable methods in a given class,
     # each in its own instance. Each instance is passed to the
     # reporter to record.
 
     def self.run reporter, options = {}
-      io = options.fetch :io, $stdout
       filter = options[:filter] || '/./'
       filter = Regexp.new $1 if filter =~ /\/(.*)\//
 
@@ -351,64 +283,16 @@ module Minitest
         filter === m || filter === "#{self}##{m}"
       }
 
-      begin
-        # before_first
-        method1 = self.new(filtered_methods.first)
-        # run method and capture exceptions.
-        method1.capture_exceptions do
-          method1.before_first_method
-        end
-        # save exceptions to reporter and check for failures
-        with_info_handler reporter do
-          # only record if failures not empty, otherwise
-          # the count (runs) are messed up. each call to .record
-          # increases count by one.
-          if !method1.failures.empty?
-            reporter.record method1
-            check_failures method1, reporter
-          end
-
-          # run the other methods
-          filtered_methods.each do |method_name|
-            method = self.new(method_name)
-            matched_name = method_name.match /test_(\d+)_/
-            if matched_name
-              test_number = matched_name[1].to_i
-              test_name = method_name.split(/_\d+_/).last
-              file_path, line_number = method.method(method_name).source_location
-              # /5/4/3/2/1/test.rb => 2/1/test.rb
-              file_path = file_path.split(File::SEPARATOR).reject(&:empty?)
-              file_path = (file_path.length >= 3 ? file_path[-3..-1] :
-                  file_path).join(File::SEPARATOR)
-              # 36 = cyan, 0 = clear
-              test_output_title = "\e[36m#{test_name} | #{test_number} |" +
-                  "#{file_path}:#{line_number}\e[0m"
-              io.puts test_output_title
-            end
-            result = method.run
-            raise "#{self}#run _must_ return self" unless self === result
-            reporter.record result
-            check_failures result, reporter
-          end
-        end
-      ensure # ensure after last runs
-        # after_last
-        # init method1 again
-        method1 = self.new(filtered_methods.first)
-        method1.capture_exceptions do
-          method1.after_last_method
-        end
-        with_info_handler reporter do
-          if !method1.failures.empty?
-            reporter.record method1
-            check_failures method1, reporter
-          end
+      with_info_handler reporter do
+        filtered_methods.each do |method_name|
+          run_one_method self, method_name, reporter
         end
       end
     end
 
-    def before_first_method; end
-    def after_last_method; end
+    def self.run_one_method klass, method_name, reporter
+      reporter.record Minitest.run_one_method(klass, method_name)
+    end
 
     def self.with_info_handler reporter, &block # :nodoc:
       handler = lambda do
@@ -507,6 +391,8 @@ module Minitest
   # you want. Go nuts.
 
   class AbstractReporter
+    include Mutex_m
+
     ##
     # Starts reporting on the run.
 
@@ -546,6 +432,7 @@ module Minitest
     attr_accessor :options
 
     def initialize io = $stdout, options = {} # :nodoc:
+      super()
       self.io      = io
       self.options = options
     end
@@ -645,6 +532,11 @@ module Minitest
     def start # :nodoc:
       super
 
+      io.puts "Run options: #{options[:args]}"
+      io.puts
+      io.puts "# Running:"
+      io.puts
+
       self.sync = io.respond_to? :"sync=" # stupid emacs
       self.old_sync, io.sync = io.sync, true if self.sync
     end
@@ -662,7 +554,8 @@ module Minitest
     end
 
     def statistics # :nodoc:
-      "Finished in #{ChronicDuration.output(total_time.round) || '0s'}"
+      "Finished in %.6fs, %.4f runs/s, %.4f assertions/s." %
+        [total_time, count / total_time, assertions / total_time]
     end
 
     def aggregated_results # :nodoc:
@@ -674,6 +567,8 @@ module Minitest
       end.join("\n") + "\n"
     end
 
+    alias to_s aggregated_results
+
     def summary # :nodoc:
       extra = ""
 
@@ -695,6 +590,7 @@ module Minitest
     attr_accessor :reporters
 
     def initialize *reporters # :nodoc:
+      super()
       self.reporters = reporters
     end
 
@@ -859,6 +755,12 @@ module Minitest
   end
 
   self.backtrace_filter = BacktraceFilter.new
+
+  def self.run_one_method klass, method_name # :nodoc:
+    result = klass.new(method_name).run
+    raise "#{klass}#run _must_ return self" unless klass === result
+    result
+  end
 end
 
 require "minitest/test"