minitest 5.10.3 → 5.11.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d4df1397bf8fc366b4b18555936d7c92853121
-  data.tar.gz: 4000474506d5056f3117b1a93e1bc4019dfd15af
+  metadata.gz: 4d31a9fcb7d45a7e535a4fbc93165ba08405b925
+  data.tar.gz: 3b62db8a5bfa1b7d232bd76d3254510c3d839c4c
 SHA512:
-  metadata.gz: 195277b6093c3650634809f445c274d8df6bfafb4f32be448f4cdde07de9edf47c64e4f05cdf3572bf79f61e2597ce33c2b7821cd147d4c8bd2f251451e86098
-  data.tar.gz: a8a16930df76274303310ba4faf115914913bea38b559ec4edfad8ae2a835fb22e7d6308c88eadf93044ea422b334d65e33c8c59f15f0ece27a962b1fc8d7e9c
+  metadata.gz: ad77547e5e3721e327d6bb96c664cce839acef498c0f059df1fd36211d35644ec040e75212c8a421430ee05adb7d5525b3aefc54e480f3cb33afb6004917077f
+  data.tar.gz: f153926171b7040a9626f029747202678e32798c2572e18bcf4f9cab5ce10e80faa074ccc3f460c56ba2027c35af0b541440e9e8a8dfce740af47211646bd2db

data/History.rdoc

@@ -1,3 +1,26 @@
+=== 5.11.0b1 / 2017-12-20
+
+* 2 major enhancements:
+
+  * Added Minitest::Result and Minitest::Result.from(runnable).
+  * Changed Minitest::Test to subclass Result and refactored methods up.
+
+* 6 minor enhancements:
+
+  * Added --no-plugins and MT_NO_PLUGINS to bypass MT plugin autoloading. Helps with bad actors installed globally.
+  * Added bench_performance_{logarithmic,power} for spec-style benchmarks. (rickhull)
+  * Minitest.run_one_method now checks for instance of Result, not exact same class.
+  * Minitest::Test.run returns a Result version of self, not self.
+  * ProgressReporter#prerecord now explicitly prints klass.name. Allows for fakers.
+  * Removed Runnable.marshal_dump/load.
+
+* 4 bug fixes:
+
+  * Object.stub no longer calls the passed block if stubbed with a callable.
+  * Object.stub now passes blocks down to the callable result.
+  * Pushed Minitest::Test#time & #time_it up to Runnable.
+  * Test nil equality directly in assert_equal. Fixes #679. (voxik)
+
 === 5.10.3 / 2017-07-21
 
 * 1 minor enhancement:

data/README.rdoc

@@ -434,11 +434,26 @@ 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.
 
+=== How to run code before a group of tests?
+
+Use a constant with begin...end like this:
+
+  describe Blah do
+    SETUP = begin
+       # ... this runs once when describe Blah starts
+    end
+    # ...
+  end
+
+This can be useful for expensive initializations or sharing state.
+Remember, this is just ruby code, so you need to make sure this
+technique and sharing state doesn't interfere with your tests.
+
 === Why am I seeing <tt>uninitialized constant MiniTest::Test (NameError)</tt>?
 
-Are you running the test with Bundler (e.g. via <tt>bundle exec</tt> )? If so, 
+Are you running the test with Bundler (e.g. via <tt>bundle exec</tt> )? If so,
 in order to require minitest, you must first add the <tt>gem 'minitest'</tt>
-to your Gemfile and run +bundle+. Once it's installed, you should be 
+to your Gemfile and run +bundle+. Once it's installed, you should be
 able to require minitest and run your tests.
 
 == Prominent Projects using Minitest:
@@ -506,7 +521,7 @@ If you see failures like either of these, you are probably missing diff tool:
 
 
 If you use Cygwin or MSYS2 or similar there are packages that include a
-GNU diff for Widnows. If you don't, you can download GNU diffutils from
+GNU diff for Windows. If you don't, you can download GNU diffutils from
 http://gnuwin32.sourceforge.net/packages/diffutils.htm
 (make sure to add it to your PATH).
 
@@ -578,7 +593,7 @@ minitest-great_expectations :: Generally useful additions to minitest's
                                assertions and expectations.
 minitest-growl              :: Test notifier for minitest via growl.
 minitest-happy              :: GLOBALLY ACTIVATE MINITEST PRIDE! RAWR!
-minitest-have_tag           :: Adds Minitest assertions to test for the existence of 
+minitest-have_tag           :: Adds Minitest assertions to test for the existence of
                                HTML tags, including contents, within a provided string.
 minitest-hooks              :: Around and before_all/after_all/around_all hooks
 minitest-hyper              :: Pretty, single-page HTML reports for your Minitest runs
@@ -588,6 +603,7 @@ minitest-instrument         :: Instrument ActiveSupport::Notifications when
 minitest-instrument-db      :: Store information about speed of test execution
                                provided by minitest-instrument in database.
 minitest-junit              :: JUnit-style XML reporter for minitest.
+minitest-keyword            :: Use Minitest assertions with keyword arguments.
 minitest-libnotify          :: Test notifier for minitest via libnotify.
 minitest-line               :: Run test at line number.
 minitest-logger             :: Define assert_log and enable minitest to test log messages.
@@ -614,10 +630,10 @@ 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-server             :: minitest-server provides a client/server setup 
-                               with your minitest process, allowing your test 
+minitest-server             :: minitest-server provides a client/server setup
+                               with your minitest process, allowing your test
                                run to send its results directly to a handler.
-minitest-sequel             :: Minitest assertions to speed-up development and 
+minitest-sequel             :: Minitest assertions to speed-up development and
                                testing of Ruby Sequel database setups.
 minitest-shared_description :: Support for shared specs and shared spec
                                subclasses

data/lib/minitest.rb

@@ -8,7 +8,7 @@ require "stringio"
 # :include: README.rdoc
 
 module Minitest
-  VERSION = "5.10.3" # :nodoc:
+  VERSION = "5.11.0b1" # :nodoc:
   ENCS = "".respond_to? :encoding # :nodoc:
 
   @@installed_at_exit ||= false
@@ -118,7 +118,7 @@ module Minitest
   #                   klass.new(runnable_method).run
 
   def self.run args = []
-    self.load_plugins
+    self.load_plugins unless args.delete("--no-plugins") || ENV["MT_NO_PLUGINS"]
 
     options = process_args args
 
@@ -175,6 +175,8 @@ module Minitest
         exit
       end
 
+      opts.on "--no-plugins", "Bypass minitest plugin auto-loading (or set $MT_NO_PLUGINS)."
+
       desc = "Sets random seed. Also via env. Eg: SEED=n rake"
       opts.on "-s", "--seed SEED", Integer, desc do |m|
         options[:seed] = m.to_i
@@ -252,6 +254,19 @@ module Minitest
 
     attr_accessor :failures
 
+    ##
+    # The time it took to run.
+
+    attr_accessor :time
+
+    def time_it # :nodoc:
+      t0 = Minitest.clock_time
+
+      yield
+    ensure
+      self.time = Minitest.clock_time - t0
+    end
+
     ##
     # Name of the run.
 
@@ -266,11 +281,6 @@ module Minitest
       @NAME = o
     end
 
-    def self.inherited klass # :nodoc:
-      self.runnables << klass
-      super
-    end
-
     ##
     # Returns all instance methods matching the pattern +re+.
 
@@ -367,14 +377,6 @@ module Minitest
       @@runnables
     end
 
-    def marshal_dump # :nodoc:
-      [self.name, self.failures, self.assertions]
-    end
-
-    def marshal_load ary # :nodoc:
-      self.name, self.failures, self.assertions = ary
-    end
-
     def failure # :nodoc:
       self.failures.first
     end
@@ -418,6 +420,94 @@ module Minitest
     end
   end
 
+  ##
+  # This represents a test result in a clean way that can be
+  # marshalled over a wire. Tests can do anything they want to the
+  # test instance and can create conditions that cause Marshal.dump to
+  # blow up. By using Result.from(a_test) you can be reasonably sure
+  # that the test result can be marshalled.
+
+  class Result < Runnable
+    ##
+    # The class name of the test result.
+
+    attr_accessor :klass
+
+    ##
+    # The test name of the test result.
+
+    attr_accessor :name
+
+    ##
+    # The location of the test method.
+
+    attr_accessor :source_location
+
+    ##
+    # Create a new test result from a Runnable instance.
+
+    def self.from runnable
+      o = runnable
+
+      r = self.new o.name
+      r.klass      = o.class.name
+      r.assertions = o.assertions
+      r.failures   = o.failures.dup
+      r.time       = o.time
+
+      r.source_location = o.method(o.name).source_location rescue ["unknown", -1]
+
+      r
+    end
+
+    ##
+    # Did this run error?
+
+    def error?
+      self.failures.any? { |f| UnexpectedError === f }
+    end
+
+    ##
+    # The location identifier of this test.
+
+    def location
+      loc = " [#{self.failure.location}]" unless passed? or error?
+      "#{self.klass}##{self.name}#{loc}"
+    end
+
+    ##
+    # Did this run pass?
+    #
+    # Note: skipped runs are not considered passing, but they don't
+    # cause the process to exit non-zero.
+
+    def passed?
+      not self.failure
+    end
+
+    ##
+    # Returns ".", "F", or "E" based on the result of the run.
+
+    def result_code
+      self.failure and self.failure.result_code or "."
+    end
+
+    ##
+    # Was this run skipped?
+
+    def skipped?
+      self.failure and Skip === self.failure
+    end
+
+    def to_s # :nodoc:
+      return location if passed? and not skipped?
+
+      failures.map { |failure|
+        "#{failure.result_label}:\n#{self.location}:\n#{failure.message}\n"
+      }.join "\n"
+    end
+  end
+
   ##
   # Defines the API for Reporters. Subclass this and override whatever
   # you want. Go nuts.
@@ -488,7 +578,7 @@ module Minitest
   class ProgressReporter < Reporter
     def prerecord klass, name #:nodoc:
       if options[:verbose] then
-        io.print "%s#%s = " % [klass, name]
+        io.print "%s#%s = " % [klass.name, name]
         io.flush
       end
     end
@@ -837,7 +927,7 @@ module Minitest
 
   def self.run_one_method klass, method_name # :nodoc:
     result = klass.new(method_name).run
-    raise "#{klass}#run _must_ return self" unless klass === result
+    raise "#{klass}#run _must_ return a Result" unless Result === result
     result
   end
 
@@ -853,6 +943,13 @@ module Minitest
     end
   end
 
+  class Runnable # re-open
+    def self.inherited klass # :nodoc:
+      self.runnables << klass
+      super
+    end
+  end
+
   # :startdoc:
 end
 

data/lib/minitest/assertions.rb

@@ -173,7 +173,7 @@ module Minitest
       msg = message(msg, E) { diff exp, act }
       result = assert exp == act, msg
 
-      if exp.nil? then
+      if nil == exp then
         if Minitest::VERSION =~ /^6/ then
           refute_nil exp, "Use assert_nil if expecting nil."
         else
@@ -205,8 +205,8 @@ module Minitest
     # For comparing Floats.  Fails unless +exp+ and +act+ have a relative
     # error less than +epsilon+.
 
-    def assert_in_epsilon a, b, epsilon = 0.001, msg = nil
-      assert_in_delta a, b, [a.abs, b.abs].min * epsilon, msg
+    def assert_in_epsilon exp, act, epsilon = 0.001, msg = nil
+      assert_in_delta exp, act, [exp.abs, act.abs].min * epsilon, msg
     end
 
     ##

data/lib/minitest/benchmark.rb

@@ -318,7 +318,7 @@ module Minitest
     # Enumerates over +enum+ mapping +block+ if given, returning the
     # sum of the result. Eg:
     #
-    #   sigma([1, 2, 3])                # => 1 + 2 + 3 => 7
+    #   sigma([1, 2, 3])                # => 1 + 2 + 3 => 6
     #   sigma([1, 2, 3]) { |n| n ** 2 } # => 1 + 4 + 9 => 14
 
     def sigma enum, &block
@@ -418,6 +418,37 @@ module Minitest
         assert_performance_exponential threshold, &work
       end
     end
+
+
+    ##
+    # Create a benchmark that verifies that the performance is logarithmic.
+    #
+    #   describe "my class Bench" do
+    #     bench_performance_logarithmic "algorithm" do |n|
+    #       @obj.algorithm(n)
+    #     end
+    #   end
+
+    def self.bench_performance_logarithmic name, threshold = 0.99, &work
+      bench name do
+        assert_performance_logarithmic threshold, &work
+      end
+    end
+
+    ##
+    # Create a benchmark that verifies that the performance is power.
+    #
+    #   describe "my class Bench" do
+    #     bench_performance_power "algorithm" do |n|
+    #       @obj.algorithm(n)
+    #     end
+    #   end
+
+    def self.bench_performance_power name, threshold = 0.99, &work
+      bench name do
+        assert_performance_power threshold, &work
+      end
+    end
   end
 
   Minitest::Spec.register_spec_type(/Bench(mark)?$/, Minitest::BenchSpec)

data/lib/minitest/mock.rb

@@ -223,15 +223,12 @@ class Object
     metaclass.send :alias_method, new_name, name
 
     metaclass.send :define_method, name do |*args, &blk|
-      ret = if val_or_callable.respond_to? :call then
-              val_or_callable.call(*args)
-            else
-              val_or_callable
-            end
-
-      blk.call(*block_args) if blk
-
-      ret
+      if val_or_callable.respond_to? :call then
+        val_or_callable.call(*args, &blk)
+      else
+        blk.call(*block_args) if blk
+        val_or_callable
+      end
     end
 
     yield self

data/lib/minitest/test.rb

@@ -7,7 +7,7 @@ module Minitest
   #
   # See Minitest::Assertions
 
-  class Test < Runnable
+  class Test < Result
     require "minitest/assertions"
     include Minitest::Assertions
 
@@ -79,20 +79,6 @@ module Minitest
       :random
     end
 
-    ##
-    # The time it took to run this test.
-
-    attr_accessor :time
-
-    def marshal_dump # :nodoc:
-      super << self.time
-    end
-
-    def marshal_load ary # :nodoc:
-      self.time = ary.pop
-      super
-    end
-
     TEARDOWN_METHODS = %w[ before_teardown teardown after_teardown ] # :nodoc:
 
     ##
@@ -115,7 +101,7 @@ module Minitest
         end
       end
 
-      self # per contract
+      Result.from self # per contract
     end
 
     ##
@@ -210,61 +196,6 @@ module Minitest
       self.failures << UnexpectedError.new(e)
     end
 
-    ##
-    # Did this run error?
-
-    def error?
-      self.failures.any? { |f| UnexpectedError === f }
-    end
-
-    ##
-    # The location identifier of this test.
-
-    def location
-      loc = " [#{self.failure.location}]" unless passed? or error?
-      "#{self.class}##{self.name}#{loc}"
-    end
-
-    ##
-    # Did this run pass?
-    #
-    # Note: skipped runs are not considered passing, but they don't
-    # cause the process to exit non-zero.
-
-    def passed?
-      not self.failure
-    end
-
-    ##
-    # Returns ".", "F", or "E" based on the result of the run.
-
-    def result_code
-      self.failure and self.failure.result_code or "."
-    end
-
-    ##
-    # Was this run skipped?
-
-    def skipped?
-      self.failure and Skip === self.failure
-    end
-
-    def time_it # :nodoc:
-      t0 = Minitest.clock_time
-
-      yield
-    ensure
-      self.time = Minitest.clock_time - t0
-    end
-
-    def to_s # :nodoc:
-      return location if passed? and not skipped?
-
-      failures.map { |failure|
-        "#{failure.result_label}:\n#{self.location}:\n#{failure.message}\n"
-      }.join "\n"
-    end
-
     def with_info_handler &block # :nodoc:
       t0 = Minitest.clock_time
 

data/test/minitest/metametameta.rb

@@ -68,6 +68,7 @@ class MetaMetaMetaTestCase < Minitest::Test
     output.sub!(/Finished in .*/, "Finished in 0.00")
     output.sub!(/Loaded suite .*/, "Loaded suite blah")
 
+    output.gsub!(/FakeNamedTest\d+/, "FakeNamedTestXX")
     output.gsub!(/ = \d+.\d\d s = /, " = 0.00 s = ")
     output.gsub!(/0x[A-Fa-f0-9]+/, "0xXXX")
     output.gsub!(/ +$/, "")

data/test/minitest/test_minitest_mock.rb

@@ -494,6 +494,17 @@ class TestMinitestStub < Minitest::Test
     @tc.assert_equal false, dynamic.found
   end
 
+  def test_stub_NameError
+    e = @tc.assert_raises NameError do
+      Time.stub :nope_nope_nope, 42 do
+        # do nothing
+      end
+    end
+
+    exp = /undefined method `nope_nope_nope' for( class)? `#{self.class}::Time'/
+    assert_match exp, e.message
+  end
+
   def test_mock_with_yield
     mock = Minitest::Mock.new
     mock.expect(:write, true) do
@@ -509,4 +520,355 @@ class TestMinitestStub < Minitest::Test
     @tc.assert_equal true, rs
   end
 
+  alias test_stub_value__old test_stub_value # TODO: remove/rename
+
+  ## Permutation Sets:
+
+  # [:value, :lambda]
+  # [:*,     :block,     :block_call]
+  # [:**,    :block_args]
+  #
+  # Where:
+  #
+  # :value      = a normal value
+  # :lambda     = callable or lambda
+  # :*          = no block
+  # :block      = normal block
+  # :block_call = :lambda invokes the block (N/A for :value)
+  # :**         = no args
+  # :args       = args passed to stub
+
+  ## Permutations
+
+  # [:call,   :*,          :**]   =>5 callable+block FIX: CALL BOTH (bug)
+  # [:call,   :*,          :**]   =>6 callable
+
+  # [:lambda, :*,          :**]   =>  lambda result
+
+  # [:lambda, :*,          :args] =>  lambda result NO ARGS
+
+  # [:lambda, :block,      :**]   =>5 lambda result FIX: CALL BOTH (bug)
+  # [:lambda, :block,      :**]   =>6 lambda result
+
+  # [:lambda, :block,      :args] =>5 lambda result FIX: CALL BOTH (bug)
+  # [:lambda, :block,      :args] =>6 lambda result
+  # [:lambda, :block,      :args] =>7 raise ArgumentError
+
+  # [:lambda, :block_call, :**]   =>5 lambda FIX: BUG!-not passed block to lambda
+  # [:lambda, :block_call, :**]   =>6 lambda+block result
+
+  # [:lambda, :block_call, :args] =>5 lambda FIX: BUG!-not passed block to lambda
+  # [:lambda, :block_call, :args] =>6 lambda+block result
+
+  # [:value,  :*,          :**]   =>  value
+
+  # [:value,  :*,          :args] =>  value, ignore args
+
+  # [:value,  :block,      :**]   =>5 value, call block
+  # [:value,  :block,      :**]   =>6 value
+
+  # [:value,  :block,      :args] =>5 value, call block w/ args
+  # [:value,  :block,      :args] =>6 value, call block w/ args, deprecated
+  # [:value,  :block,      :args] =>7 raise ArgumentError
+
+  # [:value,  :block_call, :**]   =>  N/A
+
+  # [:value,  :block_call, :args] =>  N/A
+
+  class Bar
+    def call
+      puts "hi"
+    end
+  end
+
+  class Foo
+    def self.blocking
+      yield
+    end
+  end
+
+  class Thingy
+    def self.identity arg
+      arg
+    end
+  end
+
+  def test_stub_callable_block_5 # from tenderlove
+    @assertion_count += 1
+    Foo.stub5 :blocking, Bar.new do
+      @tc.assert_output "hi\n", "" do
+        Foo.blocking do
+          @tc.flunk "shouldn't ever hit this"
+        end
+      end
+    end
+  end
+
+  def test_stub_callable_block_6 # from tenderlove
+    skip_stub6
+
+    @assertion_count += 1
+    Foo.stub6 :blocking, Bar.new do
+      @tc.assert_output "hi\n", "" do
+        Foo.blocking do
+          @tc.flunk "shouldn't ever hit this"
+        end
+      end
+    end
+  end
+
+  def test_stub_lambda
+    Thread.stub :new, lambda { 21+21 } do
+      @tc.assert_equal 42, Thread.new
+    end
+  end
+
+  def test_stub_lambda_args
+    Thread.stub :new, lambda { 21+21 }, :wtf do
+      @tc.assert_equal 42, Thread.new
+    end
+  end
+
+  def test_stub_lambda_block_5
+    Thread.stub5 :new, lambda { 21+21 } do
+      result = Thread.new do
+        @tc.flunk "shouldn't ever hit this"
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_lambda_block_6
+    skip_stub6
+
+    Thread.stub6 :new, lambda { 21+21 } do
+      result = Thread.new do
+        @tc.flunk "shouldn't ever hit this"
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_lambda_block_args_5
+    @assertion_count += 1
+    Thingy.stub5 :identity, lambda { |y| @tc.assert_equal :nope, y; 21+21 }, :WTF? do
+      result = Thingy.identity :nope do |x|
+        @tc.flunk "shouldn't reach this"
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_lambda_block_args_6
+    skip_stub6
+
+    @assertion_count += 1
+    Thingy.stub6 :identity, lambda { |y| @tc.assert_equal :nope, y; 21+21 }, :WTF? do
+      result = Thingy.identity :nope do |x|
+        @tc.flunk "shouldn't reach this"
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_lambda_block_args_6_2
+    skip_stub6
+
+    @tc.assert_raises ArgumentError do
+      Thingy.stub6_2 :identity, lambda { |y| :__not_run__ }, :WTF? do
+        # doesn't matter
+      end
+    end
+  end
+
+  def test_stub_lambda_block_call_5
+    @assertion_count += 1
+    rs = nil
+    io = StringIO.new "", "w"
+    File.stub5 :open, lambda { |p, m, &blk| blk and blk.call io } do
+      File.open "foo.txt", "r" do |f|
+        rs = f && f.write("woot")
+      end
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_lambda_block_call_6
+    skip_stub6
+
+    @assertion_count += 1
+    rs = nil
+    io = StringIO.new "", "w"
+    File.stub6 :open, lambda { |p, m, &blk| blk.call io } do
+      File.open "foo.txt", "r" do |f|
+        rs = f.write("woot")
+      end
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_lambda_block_call_args_5
+    @assertion_count += 1
+    rs = nil
+    io = StringIO.new "", "w"
+    File.stub5(:open, lambda { |p, m, &blk| blk and blk.call io }, :WTF?) do
+      File.open "foo.txt", "r" do |f|
+        rs = f.write("woot")
+      end
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_lambda_block_call_args_6
+    skip_stub6
+
+    @assertion_count += 1
+    rs = nil
+    io = StringIO.new "", "w"
+    File.stub6(:open, lambda { |p, m, &blk| blk.call io }, :WTF?) do
+      File.open "foo.txt", "r" do |f|
+        rs = f.write("woot")
+      end
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_lambda_block_call_args_6_2
+    skip_stub6
+
+    @assertion_count += 2
+    rs = nil
+    io = StringIO.new "", "w"
+    @tc.assert_raises ArgumentError do
+      File.stub6_2(:open, lambda { |p, m, &blk| blk.call io }, :WTF?) do
+        File.open "foo.txt", "r" do |f|
+          rs = f.write("woot")
+        end
+      end
+    end
+    @tc.assert_nil rs
+    @tc.assert_equal "", io.string
+  end
+
+  def test_stub_value
+    Thread.stub :new, 42 do
+      result = Thread.new
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_value_args
+    Thread.stub :new, 42, :WTF? do
+      result = Thread.new
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_value_block_5
+    @assertion_count += 1
+    Thread.stub5 :new, 42 do
+      result = Thread.new do
+        @tc.assert true
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_value_block_6
+    skip_stub6
+
+    Thread.stub6 :new, 42 do
+      result = Thread.new do
+        @tc.flunk "shouldn't hit this"
+      end
+      @tc.assert_equal 42, result
+    end
+  end
+
+  def test_stub_value_block_args_5
+    @assertion_count += 2
+    rs = nil
+    io = StringIO.new "", "w"
+    File.stub5 :open, :value, io do
+      result = File.open "foo.txt", "r" do |f|
+        rs = f.write("woot")
+      end
+      @tc.assert_equal :value, result
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_value_block_args_5__break_if_not_passed
+    e = @tc.assert_raises NoMethodError do
+      File.stub5 :open, :return_value do # intentionally bad setup w/ no args
+        File.open "foo.txt", "r" do |f|
+          f.write "woot"
+        end
+      end
+    end
+    exp = "undefined method `write' for nil:NilClass"
+    assert_equal exp, e.message
+  end
+
+  def test_stub_value_block_args_6
+    skip_stub6
+
+    @assertion_count += 2
+    rs = nil
+    io = StringIO.new "", "w"
+    assert_deprecated do
+      File.stub6 :open, :value, io do
+        result = File.open "foo.txt", "r" do |f|
+          rs = f.write("woot")
+        end
+        @tc.assert_equal :value, result
+      end
+    end
+    @tc.assert_equal 4, rs
+    @tc.assert_equal "woot", io.string
+  end
+
+  def test_stub_value_block_args_6_2
+    skip_stub6
+
+    @assertion_count += 2
+    rs = nil
+    io = StringIO.new "", "w"
+    @tc.assert_raises ArgumentError do
+      File.stub6_2 :open, :value, io do
+        result = File.open "foo.txt", "r" do |f|
+          @tc.flunk "shouldn't hit this"
+        end
+        @tc.assert_equal :value, result
+      end
+    end
+    @tc.assert_nil rs
+    @tc.assert_equal "", io.string
+  end
+
+  def assert_deprecated re = /deprecated/
+    assert_output "", re do
+      yield
+    end
+  end
+
+  def skip_stub6
+    skip "not yet" unless STUB6
+  end
+end
+
+STUB6 = ENV["STUB6"]
+
+if STUB6 then
+  require "minitest/mock6" if STUB6
+else
+  class Object
+    alias stub5 stub
+    alias stub6 stub
+  end
 end

data/test/minitest/test_minitest_reporter.rb

@@ -1,6 +1,12 @@
 require "minitest/autorun"
 require "minitest/metametameta"
 
+class Runnable
+  def woot
+    assert true
+  end
+end
+
 class TestMinitestReporter < MetaMetaMetaTestCase
 
   attr_accessor :r, :io
@@ -42,6 +48,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                                                     rescue => e
                                                       e
                                                     end)
+      @et = Minitest::Result.from @et
     end
     @et
   end
@@ -54,12 +61,13 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                         rescue Minitest::Assertion => e
                           e
                         end
+      @ft = Minitest::Result.from @ft
     end
     @ft
   end
 
   def passing_test
-    @pt ||= Minitest::Test.new(:woot)
+    @pt ||= Minitest::Result.from Minitest::Test.new(:woot)
   end
 
   def skip_test
@@ -70,6 +78,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
                       rescue Minitest::Assertion => e
                         e
                       end
+      @st = Minitest::Result.from @st
     end
     @st
   end
@@ -145,6 +154,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_fail
+    fail_test = self.fail_test
     r.record fail_test
 
     assert_equal "F", io.string
@@ -154,6 +164,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_error
+    error_test = self.error_test
     r.record error_test
 
     assert_equal "E", io.string
@@ -163,6 +174,7 @@ class TestMinitestReporter < MetaMetaMetaTestCase
   end
 
   def test_record_skip
+    skip_test = self.skip_test
     r.record skip_test
 
     assert_equal "S", io.string

data/test/minitest/test_minitest_test.rb

@@ -20,6 +20,12 @@ class AnError < StandardError; include MyModule; end
 class ImmutableString < String; def inspect; super.freeze; end; end
 SomeError = Class.new Exception
 
+class Minitest::Runnable
+  def whatever # faked for testing
+    assert true
+  end
+end
+
 class TestMinitestUnit < MetaMetaMetaTestCase
   parallelize_me!
 
@@ -79,7 +85,7 @@ class TestMinitestUnit < MetaMetaMetaTestCase
   # end
 
   def test_infectious_binary_encoding
-    @tu = Class.new Minitest::Test do
+    @tu = Class.new FakeNamedTest do
       def test_this_is_not_ascii_assertion
         assert_equal "ЁЁЁ", "ёёё"
       end
@@ -95,12 +101,12 @@ class TestMinitestUnit < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      #<Class:0xXXX>#test_this_is_non_ascii_failure_message:
+      FakeNamedTestXX#test_this_is_non_ascii_failure_message:
       RuntimeError: ЁЁЁ
           FILE:LINE:in `test_this_is_non_ascii_failure_message'
 
         2) Failure:
-      #<Class:0xXXX>#test_this_is_not_ascii_assertion [FILE:LINE]:
+      FakeNamedTestXX#test_this_is_not_ascii_assertion [FILE:LINE]:
       Expected: \"ЁЁЁ\"
         Actual: \"ёёё\"
 
@@ -207,10 +213,10 @@ class TestMinitestRunner < MetaMetaMetaTestCase
 
       def run
         @foo = "hi mom!"
-        super
+        r = super
         @foo = "okay"
 
-        self # per contract
+        r
       end
 
       def test_something
@@ -247,7 +253,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      #<Class:0xXXX>#test_error:
+      FakeNamedTestXX#test_error:
       RuntimeError: unhandled exception
           FILE:LINE:in \`test_error\'
 
@@ -275,7 +281,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Error:
-      #<Class:0xXXX>#test_something:
+      FakeNamedTestXX#test_something:
       RuntimeError: unhandled exception
           FILE:LINE:in \`teardown\'
 
@@ -294,7 +300,7 @@ class TestMinitestRunner < MetaMetaMetaTestCase
       Finished in 0.00
 
         1) Failure:
-      #<Class:0xXXX>#test_failure [FILE:LINE]:
+      FakeNamedTestXX#test_failure [FILE:LINE]:
       Expected false to be truthy.
 
       2 runs, 2 assertions, 1 failures, 0 errors, 0 skips
@@ -500,13 +506,13 @@ class TestMinitestRunner < MetaMetaMetaTestCase
     end
 
     expected = clean <<-EOM
-      #<Class:0xXXX>#test_skip = 0.00 s = S
-      #<Class:0xXXX>#test_something = 0.00 s = .
+      FakeNamedTestXX#test_skip = 0.00 s = S
+      FakeNamedTestXX#test_something = 0.00 s = .
 
       Finished in 0.00
 
         1) Skipped:
-      #<Class:0xXXX>#test_skip [FILE:LINE]:
+      FakeNamedTestXX#test_skip [FILE:LINE]:
       not yet
 
       2 runs, 1 assertions, 0 failures, 0 errors, 1 skips
@@ -754,7 +760,7 @@ class TestMinitestRunnable < Minitest::Test
     end
     tc.setup
 
-    @tc = tc
+    @tc = Minitest::Result.from tc
   end
 
   def assert_marshal expected_ivars
@@ -772,7 +778,26 @@ class TestMinitestRunnable < Minitest::Test
   def test_marshal
     setup_marshal Minitest::Runnable
 
-    assert_marshal %w[@NAME @assertions @failures]
+    assert_marshal %w[@assertions @failures @klass @name @source_location @time]
+  end
+
+  def test_spec_marshal
+    klass = describe("whatever") { it("passes") { assert true } }
+    rm = klass.runnable_methods.first
+
+    # Run the test
+    @tc = klass.new(rm).run
+
+    assert_kind_of Minitest::Result, @tc
+
+    # Pass it over the wire
+    over_the_wire = Marshal.load Marshal.dump @tc
+
+    assert_equal @tc.time,       over_the_wire.time
+    assert_equal @tc.name,       over_the_wire.name
+    assert_equal @tc.assertions, over_the_wire.assertions
+    assert_equal @tc.failures,   over_the_wire.failures
+    assert_equal @tc.klass,      over_the_wire.klass
   end
 end
 
@@ -782,7 +807,7 @@ class TestMinitestTest < TestMinitestRunnable
       tc.time = 3.14
     end
 
-    assert_marshal %w[@NAME @assertions @failures @time] do |new_tc|
+    assert_marshal %w[@assertions @failures @klass @name @source_location @time] do |new_tc|
       assert_in_epsilon 3.14, new_tc.time
     end
   end
@@ -2087,12 +2112,12 @@ class TestMinitestUnitRecording < MetaMetaMetaTestCase
 
     exp = clean "
       Error:
-      #<Class:0xXXX>#test_method:
+      FakeNamedTestXX#test_method:
       AnError: AnError
           FILE:LINE:in `test_method'
 
       Error:
-      #<Class:0xXXX>#test_method:
+      FakeNamedTestXX#test_method:
       RuntimeError: unhandled exception
           FILE:LINE:in `teardown'
     "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.11.0b1
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,17 +20,16 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
+  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
+  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
+  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
+  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
+  V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -166,12 +165,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: minitest provides a complete suite of testing facilities supporting TDD,