minitest 2.11.0 → 2.11.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.11.1 / 2012-02-01
+
+* 2 bug fixes:
+
+  * Improved description for --name argument (drd)
+  * Ensure Mock#expect's expected args is an Array. (mperham)
+
 === 2.11.0 / 2012-01-25
 
 * 2 minor enhancements:

data/lib/minitest/mock.rb

@@ -19,8 +19,8 @@ module MiniTest
     end
 
     def initialize # :nodoc:
-      @expected_calls = {}
-      @actual_calls = Hash.new {|h,k| h[k] = [] }
+      @expected_calls = Hash.new { |calls, name| calls[name] = [] }
+      @actual_calls   = Hash.new { |calls, name| calls[name] = [] }
     end
 
     ##
@@ -45,7 +45,8 @@ module MiniTest
     #   @mock.verify  # => raises MockExpectationError
 
     def expect(name, retval, args=[])
-      @expected_calls[name] = { :retval => retval, :args => args }
+      raise ArgumentError, "args must be an array" unless Array === args
+      @expected_calls[name] << { :retval => retval, :args => args }
       self
     end
 
@@ -55,36 +56,47 @@ module MiniTest
     # expected.
 
     def verify
-      @expected_calls.each_key do |name|
-        expected = @expected_calls[name]
-        msg1 = "expected #{name}, #{expected.inspect}"
-        msg2 = "#{msg1}, got #{@actual_calls[name].inspect}"
-
-        raise MockExpectationError, msg2 if
-          @actual_calls.has_key? name and
-          not @actual_calls[name].include?(expected)
-
-        raise MockExpectationError, msg1 unless
-          @actual_calls.has_key? name and @actual_calls[name].include?(expected)
+      @expected_calls.each do |name, calls|
+        calls.each do |expected|
+          msg1 = "expected #{name}, #{expected.inspect}"
+          msg2 = "#{msg1}, got #{@actual_calls[name].inspect}"
+
+          raise MockExpectationError, msg2 if
+            @actual_calls.has_key? name and
+            not @actual_calls[name].include?(expected)
+
+          raise MockExpectationError, msg1 unless
+            @actual_calls.has_key? name and @actual_calls[name].include?(expected)
+        end
       end
       true
     end
 
     def method_missing(sym, *args) # :nodoc:
-      expected = @expected_calls[sym]
-
-      unless expected then
+      unless @expected_calls.has_key?(sym) then
         raise NoMethodError, "unmocked method %p, expected one of %p" %
           [sym, @expected_calls.keys.sort_by(&:to_s)]
       end
 
-      expected_args, retval = expected[:args], expected[:retval]
+      expected_calls = @expected_calls[sym].select { |call| call[:args].size == args.size }
+
+      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]
+      end
+
+      expected_call = expected_calls.find do |call|
+        call[:args].zip(args).all? { |mod, a| mod === a or mod == a }
+      end
 
-      unless expected_args.size == args.size
-        raise ArgumentError, "mocked method %p expects %d arguments, got %d" %
-          [sym, expected[:args].size, args.size]
+      unless expected_call
+        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 }

data/lib/minitest/unit.rb

@@ -643,7 +643,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "2.11.0" # :nodoc:
+    VERSION = "2.11.1" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :test_count, :assertion_count       # :nodoc:
@@ -893,7 +893,7 @@ module MiniTest
           options[:verbose] = true
         end
 
-        opts.on '-n', '--name PATTERN', "Filter test names on pattern." do |a|
+        opts.on '-n', '--name PATTERN', "Filter test names on pattern (e.g. /foo/)" do |a|
           options[:filter] = a
         end
 

data/test/test_minitest_mock.rb

@@ -78,9 +78,15 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     @mock.meaning_of_life
     @mock.expect(:sum, 3, [1, 2])
 
-    @mock.sum(2, 4)
+    assert_raises MockExpectationError do
+      @mock.sum(2, 4)
+    end
+  end
 
-    util_verify_bad
+  def test_expect_with_non_array_args
+    assert_raises ArgumentError do
+      @mock.expect :blah, 3, false
+    end
   end
 
   def test_respond_appropriately
@@ -136,15 +142,19 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
   def test_verify_raises_with_strict_args
     mock = MiniTest::Mock.new
     mock.expect :strict_expectation, true, [2]
-    mock.strict_expectation 1
 
-    util_verify_bad
+    assert_raises MockExpectationError do
+      mock.strict_expectation 1
+    end
   end
 
   def test_verify_shows_the_actual_arguments_in_the_message
     mock = MiniTest::Mock.new
     mock.expect :capitalized, true, ["a"]
+    mock.expect :capitalized, true, ["b"]
+
     mock.capitalized "b"
+
     e = assert_raises MockExpectationError do
       mock.verify
     end
@@ -156,6 +166,27 @@ class TestMiniTestMock < MiniTest::Unit::TestCase
     assert_equal expected, e.message
   end
 
+  def test_same_method_expects_are_verified_when_all_called
+    mock = MiniTest::Mock.new
+    mock.expect :foo, nil, [:bar]
+    mock.expect :foo, nil, [:baz]
+
+    mock.foo :bar
+    mock.foo :baz
+
+    assert mock.verify
+  end
+
+  def test_same_method_expects_blow_up_when_not_all_called
+    mock = MiniTest::Mock.new
+    mock.expect :foo, nil, [:bar]
+    mock.expect :foo, nil, [:baz]
+
+    mock.foo :baz
+
+    assert_raises(MockExpectationError) { mock.verify }
+  end
+  
   def util_verify_bad
     assert_raises MockExpectationError do
       @mock.verify

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 2
   - 11
-  - 0
-  version: 2.11.0
+  - 1
+  version: 2.11.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc