minitest 5.8.2 → 5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e73d8fe685e6cb4727955381137123cc1f949c1
-  data.tar.gz: 2de42338dc1a9730ec2e0ba4918405bd807baf42
+  metadata.gz: afba7b74c4a3b74b76007242b439f17720f039c6
+  data.tar.gz: 517dac13240555cb8e0688f40b7077d56756e8e4
 SHA512:
-  metadata.gz: 674d65b77d0e0bd9d7c3babd3bcd68a5737f8936cc5e0135996447de2e3bf44c0a86a44eff1682781b008473468c5701a585f3af29f326981cff94fe02c7428f
-  data.tar.gz: 2ef280c1f4deea413790851d720e72680aca4be4e6d4a290b8ebd2879d074e6f3d984eb8dcadf1c7d1ede005a38fff3fd9437134475cc17a94fac2789ab2917d
+  metadata.gz: a660c1e4b7335d0db45770c906351070f317a00f4e6b76a1d1ce882efbbd0a8343f3854351a3d18540dcb33dd5c7a30470a1610828883262bcd7c36734bf6f4d
+  data.tar.gz: 4d406c3a9bf69bb7606f40df5231b31f79be461ea4e17fd01b8287ef37fd63e6bb4d6fc58592e2815793c20fc85030ec89ee6e40b44646f75e96cce0df2ad6b3

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 5.8.3 / 2015-11-17
+
+* 1 minor enhancement:
+
+  * Added extra note about mocks and threads to readme. (zamith)
+
+* 1 bug fix:
+
+  * Fixed bug in Mock#verify. (pithub/zamith)
+
 === 5.8.2 / 2015-10-26
 
 * 1 bug fix:

data/README.rdoc

@@ -219,6 +219,20 @@ verification to ensure they got all the calls they were expecting."
     end
   end
 
+**Multi-threading and Mocks**
+
+Minitest mocks do not support multi-threading if it works, fine, if it doesn't
+you can use regular ruby patterns and facilities like local variables. Here's
+an example of asserting that code inside a thread is run:
+
+  def test_called_inside_thread
+    called = false
+    pr = Proc.new { called = true }
+    thread = Thread.new(&pr)
+    thread.join
+    assert called, "proc not called"
+  end
+
 === Stubs
 
 Mocks and stubs are defined using terminology by Fowler & Meszaros at

data/lib/minitest.rb

@@ -7,7 +7,7 @@ require "minitest/parallel"
 # :include: README.rdoc
 
 module Minitest
-  VERSION = "5.8.2" # :nodoc:
+  VERSION = "5.8.3" # :nodoc:
   ENCS = "".respond_to? :encoding # :nodoc:
 
   @@installed_at_exit ||= false

data/lib/minitest/mock.rb

@@ -65,8 +65,7 @@ module Minitest # :nodoc:
     #   @mock.verify  # => true
     #
     #   @mock.expect(:uses_one_string, true, ["foo"])
-    #   @mock.uses_one_string("bar") # => true
-    #   @mock.verify  # => raises MockExpectationError
+    #   @mock.uses_one_string("bar") # => raises MockExpectationError
 
     def expect(name, retval, args = [], &blk)
       name = name.to_sym
@@ -96,16 +95,11 @@ module Minitest # :nodoc:
     # expected.
 
     def verify
-      @expected_calls.each do |name, calls|
-        calls.each do |expected|
-          raise MockExpectationError, "expected #{__call name, expected}, got [#{__call name, @actual_calls[name]}]" if
-            @actual_calls.key?(name) and
-            not @actual_calls[name].include?(expected)
-
-          raise MockExpectationError, "expected #{__call name, expected}" unless
-            @actual_calls.key?(name) and
-            @actual_calls[name].include?(expected)
-        end
+      @expected_calls.each do |name, expected|
+        actual = @actual_calls.fetch(name, nil)
+        raise MockExpectationError, "expected #{__call name, expected[0]}" unless actual
+        raise MockExpectationError, "expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
+          actual.size < expected.size
       end
       true
     end

data/test/minitest/test_minitest_mock.rb

@@ -240,6 +240,20 @@ class TestMinitestMock < Minitest::Test
     assert_equal exp, e.message
   end
 
+  def test_same_method_expects_with_same_args_blow_up_when_not_all_called
+    mock = Minitest::Mock.new
+    mock.expect :foo, nil, [:bar]
+    mock.expect :foo, nil, [:bar]
+
+    mock.foo :bar
+
+    e = assert_raises(MockExpectationError) { mock.verify }
+
+    exp = "expected foo(:bar) => nil, got [foo(:bar) => nil]"
+
+    assert_equal exp, e.message
+  end
+
   def test_verify_passes_when_mock_block_returns_true
     mock = Minitest::Mock.new
     mock.expect :foo, nil do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.8.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
   NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc