minitest 2.12.1 → 3.0.0

data/.autotest

@@ -10,6 +10,7 @@ Autotest.add_hook :initialize do |at|
   at.extra_class_map["TestMeta"]                 = "test/test_minitest_spec.rb"
   at.extra_class_map["TestMiniTestUnitTestCase"] = "test/test_minitest_unit.rb"
   at.extra_class_map["TestMiniTestUnit"]         = "test/test_minitest_unit.rb"
+  at.extra_class_map["TestMiniTestStub"]         = "test/test_minitest_mock.rb"
   at.add_exception 'coverage.info'
   at.add_exception 'coverage'
 end

data/History.txt

@@ -1,3 +1,21 @@
+=== 3.0.0 / 2012-05-08
+
+* 3 major enhancements:
+
+  * Added Object#stub (in minitest/mock.rb).
+  * Mock#expect mocks are used in the order they're given.
+  * Mock#verify now strictly compares against expect calls.
+
+* 3 minor enhancements:
+
+  * Added caller to deprecation message.
+  * Mock error messages are much prettier.
+  * Removed String check for RHS of assert/refute_match. This lets #to_str work properly.
+
+* 1 bug fix:
+
+  * Support drive letter on Windows. Patch provided from MRI by Usaku NAKAMURA. (ayumin)
+
 === 2.12.1 / 2012-04-10
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -11,8 +11,8 @@ lib/minitest/mock.rb
 lib/minitest/pride.rb
 lib/minitest/spec.rb
 lib/minitest/unit.rb
-test/metametameta.rb
-test/test_minitest_benchmark.rb
-test/test_minitest_mock.rb
-test/test_minitest_spec.rb
-test/test_minitest_unit.rb
+test/minitest/metametameta.rb
+test/minitest/test_minitest_benchmark.rb
+test/minitest/test_minitest_mock.rb
+test/minitest/test_minitest_spec.rb
+test/minitest/test_minitest_unit.rb

data/README.txt

@@ -33,8 +33,8 @@ algorithms in a repeatable manner. Now you can assert that your newb
 co-worker doesn't replace your linear algorithm with an exponential
 one!
 
-minitest/mock by Steven Baker, is a beautifully tiny mock object
-framework.
+minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
+object framework.
 
 minitest/pride shows pride in testing and adds coloring to your test
 output. I guess it is an example of how to write IO pipes too. :P
@@ -54,7 +54,7 @@ discovery.
 * minitest/autorun - the easy and explicit way to run all your tests.
 * minitest/unit - a very fast, simple, and clean test system.
 * minitest/spec - a very fast, simple, and clean spec system.
-* minitest/mock - a simple and clean mock system.
+* minitest/mock - a simple and clean mock/stub system.
 * minitest/benchmark - an awesome way to assert your algorithm's performance.
 * minitest/pride - show your pride in testing!
 * Incredibly small and fast runner, but no bells and whistles.
@@ -194,6 +194,18 @@ Output is tab-delimited to make it easy to paste into a spreadsheet.
     end
   end
 
+=== Stubs
+
+  def test_stale_eh
+    obj_under_test = Something.new
+
+    refute obj_under_test.stale?
+
+    Time.stub :now, Time.at(0) do   # stub goes away once the block is done
+      assert obj_under_test.stale?
+    end
+  end
+
 === Customizable Test Runner Types:
 
 MiniTest::Unit.runner=(runner) provides an easy way of creating custom
@@ -284,6 +296,7 @@ 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.
 
 == REQUIREMENTS:
 

data/lib/minitest/mock.rb

@@ -50,6 +50,15 @@ module MiniTest
       self
     end
 
+    def call name, data
+      case data
+      when Hash then
+        "#{name}(#{data[:args].inspect[1..-2]}) => #{data[:retval].inspect}"
+      else
+        data.map { |d| call name, d }.join ", "
+      end
+    end
+
     ##
     # Verify that all methods were called as expected. Raises
     # +MockExpectationError+ if the mock object was not called as
@@ -58,8 +67,8 @@ module MiniTest
     def verify
       @expected_calls.each do |name, calls|
         calls.each do |expected|
-          msg1 = "expected #{name}, #{expected.inspect}"
-          msg2 = "#{msg1}, got #{@actual_calls[name].inspect}"
+          msg1 = "expected #{call name, expected}"
+          msg2 = "#{msg1}, got [#{call name, @actual_calls[name]}]"
 
           raise MockExpectationError, msg2 if
             @actual_calls.has_key? name and
@@ -78,25 +87,30 @@ module MiniTest
           [sym, @expected_calls.keys.sort_by(&:to_s)]
       end
 
-      expected_calls = @expected_calls[sym].select { |call| call[:args].size == args.size }
+      index = @actual_calls[sym].length
+      expected_call = @expected_calls[sym][index]
 
-      if expected_calls.empty?
-        arg_sizes = @expected_calls[sym].map { |call| call[:args].size }.uniq.sort
-        raise ArgumentError, "mocked method %p expects %s arguments, got %d" %
-          [sym, arg_sizes.join('/'), args.size]
+      unless expected_call then
+        raise MockExpectationError, "No more expects available for %p: %p" %
+          [sym, args]
       end
 
-      expected_call = expected_calls.find do |call|
-        call[:args].zip(args).all? { |mod, a| mod === a or mod == a }
+      expected_args, retval = expected_call[:args], expected_call[:retval]
+
+      if expected_args.size != args.size then
+        raise ArgumentError, "mocked method %p expects %d arguments, got %d" %
+          [sym, expected_args.size, args.size]
       end
 
-      unless expected_call
+      fully_matched = expected_args.zip(args).all? { |mod, a|
+        mod === a or mod == a
+      }
+
+      unless fully_matched then
         raise MockExpectationError, "mocked method %p called with unexpected arguments %p" %
           [sym, args]
       end
 
-      expected_args, retval = expected_call[:args], expected_call[:retval]
-      
       @actual_calls[sym] << {
         :retval => retval,
         :args => expected_args.zip(args).map { |mod, a| mod === a ? mod : a }
@@ -111,3 +125,41 @@ module MiniTest
     end
   end
 end
+
+class Object # :nodoc:
+
+  ##
+  # Add a temporary stubbed method replacing +name+ for the duration
+  # of the +block+. If +val_or_callable+ responds to #call, then it
+  # returns the result of calling it, otherwise returns the value
+  # as-is. Cleans up the stub at the end of the +block+.
+  #
+  #     def test_stale_eh
+  #       obj_under_test = Something.new
+  #       refute obj_under_test.stale?
+  #
+  #       Time.stub :now, Time.at(0) do
+  #         assert obj_under_test.stale?
+  #       end
+  #     end
+
+  def stub name, val_or_callable, &block
+    new_name = "__minitest_stub__#{name}"
+
+    metaclass = class << self; self; end
+    metaclass.send :alias_method, new_name, name
+    metaclass.send :define_method, name do |*args|
+      if val_or_callable.respond_to? :call then
+        val_or_callable.call(*args)
+      else
+        val_or_callable
+      end
+    end
+
+    yield
+  ensure
+    metaclass.send :undef_method, name
+    metaclass.send :alias_method, name, new_name
+    metaclass.send :undef_method, new_name
+  end
+end

data/lib/minitest/unit.rb

@@ -186,7 +186,7 @@ module MiniTest
     # Fails unless the block returns a true value.
 
     def assert_block msg = nil
-      warn "NOTE: MiniTest::Unit::TestCase#assert_block is deprecated, use assert. It will be removed on or after 2012-06-01."
+      warn "NOTE: MiniTest::Unit::TestCase#assert_block is deprecated, use assert. It will be removed on or after 2012-06-01. Called from #{caller.first}"
       msg = message(msg) { "Expected block to return true value" }
       assert yield, msg
     end
@@ -270,13 +270,13 @@ module MiniTest
     end
 
     ##
-    # Fails unless +exp+ is <tt>=~</tt> +act+.
+    # Fails unless +matcher+ <tt>=~</tt> +obj+.
 
-    def assert_match exp, act, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(exp)} to match #{mu_pp(act)}" }
-      assert_respond_to act, :"=~"
-      exp = Regexp.new Regexp.escape exp if String === exp and String === act
-      assert exp =~ act, msg
+    def assert_match matcher, obj, msg = nil
+      msg = message(msg) { "Expected #{mu_pp matcher} to match #{mu_pp obj}" }
+      assert_respond_to matcher, :"=~"
+      matcher = Regexp.new Regexp.escape matcher if String === matcher
+      assert matcher =~ obj, msg
     end
 
     ##
@@ -521,7 +521,7 @@ module MiniTest
     end
 
     ##
-    # For comparing Floats.  Fails if +exp+ is within +delta+ of +act+
+    # For comparing Floats.  Fails if +exp+ is within +delta+ of +act+.
     #
     #   refute_in_delta Math::PI, (22.0 / 7.0)
 
@@ -542,7 +542,7 @@ module MiniTest
     end
 
     ##
-    # Fails if +collection+ includes +obj+
+    # Fails if +collection+ includes +obj+.
 
     def refute_includes collection, obj, msg = nil
       msg = message(msg) {
@@ -553,7 +553,7 @@ module MiniTest
     end
 
     ##
-    # Fails if +obj+ is an instance of +cls+
+    # Fails if +obj+ is an instance of +cls+.
 
     def refute_instance_of cls, obj, msg = nil
       msg = message(msg) {
@@ -563,7 +563,7 @@ module MiniTest
     end
 
     ##
-    # Fails if +obj+ is a kind of +cls+
+    # Fails if +obj+ is a kind of +cls+.
 
     def refute_kind_of cls, obj, msg = nil # TODO: merge with instance_of
       msg = message(msg) { "Expected #{mu_pp(obj)} to not be a kind of #{cls}" }
@@ -571,13 +571,13 @@ module MiniTest
     end
 
     ##
-    # Fails if +exp+ <tt>=~</tt> +act+
+    # Fails if +matcher+ <tt>=~</tt> +obj+.
 
-    def refute_match exp, act, msg = nil
-      msg = message(msg) { "Expected #{mu_pp(exp)} to not match #{mu_pp(act)}" }
-      assert_respond_to act, :"=~"
-      exp = (/#{Regexp.escape exp}/) if String === exp and String === act
-      refute exp =~ act, msg
+    def refute_match matcher, obj, msg = nil
+      msg = message(msg) {"Expected #{mu_pp matcher} to not match #{mu_pp obj}"}
+      assert_respond_to matcher, :"=~"
+      matcher = Regexp.new Regexp.escape matcher if String === matcher
+      refute matcher =~ obj, msg
     end
 
     ##
@@ -645,7 +645,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "2.12.1" # :nodoc:
+    VERSION = "3.0.0" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:

data/test/{metametameta.rb → minitest/metametameta.rb}

@@ -19,8 +19,15 @@ class MetaMetaMetaTestCase < MiniTest::Unit::TestCase
     output = @output.string.dup
     output.sub!(/Finished tests in .*/, "Finished tests in 0.00")
     output.sub!(/Loaded suite .*/, 'Loaded suite blah')
-    output.gsub!(/\[[^\]:]+:\d+\]/, '[FILE:LINE]')
-    output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in')
+
+    if windows? then
+      output.gsub!(/\[(?:[A-Za-z]:)?[^\]:]+:\d+\]/, '[FILE:LINE]')
+      output.gsub!(/^(\s+)(?:[A-Za-z]:)?[^:]+:\d+:in/, '\1FILE:LINE:in')
+    else
+      output.gsub!(/\[[^\]:]+:\d+\]/, '[FILE:LINE]')
+      output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in')
+    end
+
     assert_equal(expected, output)
   end
 

data/test/{test_minitest_mock.rb → minitest/test_minitest_mock.rb}

@@ -20,7 +20,7 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
   def test_blow_up_if_not_called
     @mock.foo
 
-    util_verify_bad
+    util_verify_bad "expected meaning_of_life() => 42, got []"
   end
 
   def test_not_blow_up_if_everything_called
@@ -40,7 +40,7 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     @mock.meaning_of_life
     @mock.expect(:bar, true)
 
-    util_verify_bad
+    util_verify_bad "expected bar() => true, got []"
   end
 
   def test_blow_up_on_wrong_number_of_arguments
@@ -78,15 +78,20 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     @mock.meaning_of_life
     @mock.expect(:sum, 3, [1, 2])
 
-    assert_raises MockExpectationError do
+    e = assert_raises MockExpectationError do
       @mock.sum(2, 4)
     end
+
+    exp = "mocked method :sum called with unexpected arguments [2, 4]"
+    assert_equal exp, e.message
   end
 
   def test_expect_with_non_array_args
-    assert_raises ArgumentError do
+    e = assert_raises ArgumentError do
       @mock.expect :blah, 3, false
     end
+
+    assert_equal "args must be an array", e.message
   end
 
   def test_respond_appropriately
@@ -143,27 +148,26 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     mock = MiniTest::Mock.new
     mock.expect :strict_expectation, true, [2]
 
-    assert_raises MockExpectationError do
+    e = assert_raises MockExpectationError do
       mock.strict_expectation 1
     end
+
+    exp = "mocked method :strict_expectation called with unexpected arguments [1]"
+    assert_equal exp, e.message
   end
 
-  def test_verify_shows_the_actual_arguments_in_the_message
+  def test_method_missing_empty
     mock = MiniTest::Mock.new
-    mock.expect :capitalized, true, ["a"]
-    mock.expect :capitalized, true, ["b"]
 
-    mock.capitalized "b"
+    mock.expect :a, nil
+
+    mock.a
 
     e = assert_raises MockExpectationError do
-      mock.verify
+      mock.a
     end
 
-    a = {:retval=>true, :args=>["a"]}
-    b = {:retval=>true, :args=>["b"]}
-
-    expected = "expected capitalized, #{a.inspect}, got [#{b.inspect}]"
-    assert_equal expected, e.message
+    assert_equal "No more expects available for :a: []", e.message
   end
 
   def test_same_method_expects_are_verified_when_all_called
@@ -182,14 +186,79 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     mock.expect :foo, nil, [:bar]
     mock.expect :foo, nil, [:baz]
 
-    mock.foo :baz
+    mock.foo :bar
+
+    e = assert_raises(MockExpectationError) { mock.verify }
 
-    assert_raises(MockExpectationError) { mock.verify }
+    exp = "expected foo(:baz) => nil, got [foo(:bar) => nil]"
+
+    assert_equal exp, e.message
   end
-  
-  def util_verify_bad
-    assert_raises MockExpectationError do
+
+  def util_verify_bad exp
+    e = assert_raises MockExpectationError do
       @mock.verify
     end
+
+    assert_equal exp, e.message
+  end
+end
+
+require "test/minitest/metametameta"
+
+class TestMiniTestStub < MiniTest::Unit::TestCase
+  def setup
+    super
+    MiniTest::Unit::TestCase.reset
+
+    @tc = MiniTest::Unit::TestCase.new 'fake tc'
+    @assertion_count = 1
+  end
+
+  def teardown
+    super
+    assert_equal @assertion_count, @tc._assertions
+  end
+
+  def assert_stub val_or_callable
+    @assertion_count += 1
+
+    t = Time.now.to_i
+
+    Time.stub :now, val_or_callable do
+      @tc.assert_equal 42, Time.now
+    end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
+  end
+
+  def test_stub_value
+    assert_stub 42
+  end
+
+  def test_stub_block
+    assert_stub lambda { 42 }
+  end
+
+  def test_stub_block_args
+    @assertion_count += 1
+
+    t = Time.now.to_i
+
+    Time.stub :now,  lambda { |n| n * 2 } do
+      @tc.assert_equal 42, Time.now(21)
+    end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
+  end
+
+  def test_stub_callable
+    obj = Object.new
+
+    def obj.call
+      42
+    end
+
+    assert_stub obj
   end
 end

data/test/{test_minitest_unit.rb → minitest/test_minitest_unit.rb}

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'test/metametameta'
+require 'test/minitest/metametameta'
 
 module MyModule; end
 class AnError < StandardError; include MyModule; end
@@ -699,13 +699,16 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
 
   def test_assert_block
     exp = ["NOTE: MiniTest::Unit::TestCase#assert_block is deprecated,",
-           "use assert. It will be removed on or after 2012-06-01.\n"].join " "
+           "use assert. It will be removed on or after 2012-06-01."].join " "
 
-    assert_output "", exp do
+    out, err = capture_io do
       @tc.assert_block do
         true
       end
     end
+
+    assert_equal "", out
+    assert_match exp, err
   end
 
   def test_assert_block_triggered
@@ -927,7 +930,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     @tc.assert_match(/\w+/, "blah blah blah")
   end
 
-  def test_assert_match_object
+  def test_assert_match_matcher_object
     @assertion_count = 2
 
     pattern = Object.new
@@ -936,6 +939,15 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
     @tc.assert_match pattern, 5
   end
 
+  def test_assert_match_matchee_to_str
+    @assertion_count = 2
+
+    obj = Object.new
+    def obj.to_str; "blah" end
+
+    @tc.assert_match "blah", obj
+  end
+
   def test_assert_match_object_triggered
     @assertion_count = 2
 
@@ -1454,7 +1466,7 @@ FILE:LINE:in `test_assert_raises_triggered_subclass'
     @tc.refute_match(/\d+/, "blah blah blah")
   end
 
-  def test_refute_match_object
+  def test_refute_match_matcher_object
     @assertion_count = 2
     @tc.refute_match Object.new, 5 # default #=~ returns false
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 7
   prerelease: 
   segments: 
-  - 2
-  - 12
-  - 1
-  version: 2.12.1
+  - 3
+  - 0
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-04-11 00:00:00 Z
+date: 2012-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -96,8 +96,8 @@ description: |-
   co-worker doesn't replace your linear algorithm with an exponential
   one!
   
-  minitest/mock by Steven Baker, is a beautifully tiny mock object
-  framework.
+  minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
+  object framework.
   
   minitest/pride shows pride in testing and adds coloring to your test
   output. I guess it is an example of how to write IO pipes too. :P
@@ -135,11 +135,11 @@ files:
 - lib/minitest/pride.rb
 - lib/minitest/spec.rb
 - lib/minitest/unit.rb
-- test/metametameta.rb
-- test/test_minitest_benchmark.rb
-- test/test_minitest_mock.rb
-- test/test_minitest_spec.rb
-- test/test_minitest_unit.rb
+- test/minitest/metametameta.rb
+- test/minitest/test_minitest_benchmark.rb
+- test/minitest/test_minitest_mock.rb
+- test/minitest/test_minitest_spec.rb
+- test/minitest/test_minitest_unit.rb
 - .gemtest
 homepage: https://github.com/seattlerb/minitest
 licenses: []
@@ -176,7 +176,7 @@ signing_key:
 specification_version: 3
 summary: minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking
 test_files: 
-- test/test_minitest_benchmark.rb
-- test/test_minitest_mock.rb
-- test/test_minitest_spec.rb
-- test/test_minitest_unit.rb
+- test/minitest/test_minitest_benchmark.rb
+- test/minitest/test_minitest_mock.rb
+- test/minitest/test_minitest_spec.rb
+- test/minitest/test_minitest_unit.rb

metadata.gz.sig

@@ -1,2 +1,3 @@
-c'�i@@����m%����t#�A�n%.}�$Δ��8Җ��d�S��a��p����
���;�0�B<4w������f<
-�i�½�
�N…���\�t,���cY�c��?k!1�rD��|C��
+���ܘJ�E��$�3�l��#aTW�Hob�>� 
$MZ�3ڔ#?�2��J1��T�"Ҹ
+�GaW:��6r��kס�F=��,�쏎�5��:��"�B� ��d�
+i!a,`DӰ����']��I� x�K�:�j&(h���85P ��"�ⵡC���(�>x0)��Id�P	�s���FG���*�<E�p�}r��}<��?3P�H9[LG