jferris-mocha 0.9.5.0.1240351621 → 0.9.5.0.1241126838

data/lib/mocha/api.rb

@@ -185,7 +185,7 @@ module Mocha # :nodoc:
           @expectation.send(method, *args, &block)
         end
         @expectation.invocation_count = invocation_count
-        @expectation.satisfied?
+        @expectation.verified?
       end
       
       def failure_message

data/test/acceptance/spy_test.rb

@@ -85,7 +85,7 @@ module SpyTestMethods
     assert_matcher_accepts have_received(:to_s).twice, instance
   end
 
-  def test_should_reject_incorrect_number_of_calls
+  def test_should_reject_not_enough_calls
     instance = new_instance
     instance.stubs(:to_s)
     instance.to_s
@@ -94,6 +94,15 @@ module SpyTestMethods
     assert_fails(message) { assert_matcher_accepts have_received(:to_s).twice, instance }
   end
 
+  def test_should_reject_too_many_calls
+    instance = new_instance
+    instance.stubs(:to_s)
+    2.times { instance.to_s }
+    message = /expected exactly once/
+    assert_fails(message) { assert_received(instance, :to_s) {|expect| expect.once } }
+    assert_fails(message) { assert_matcher_accepts have_received(:to_s).once, instance }
+  end
+
   def assert_fails(message=/not yet invoked/)
     begin
       yield

data/test/unit/assert_received_test.rb

@@ -107,7 +107,7 @@ class AssertReceivedTest < Test::Unit::TestCase
     end
   end
 
-  def test_fails_if_invocation_count_incorrect
+  def test_fails_if_invocation_count_too_low
     method = :a_method
     mock   = FakeMock.new('a mock')
     Mockery.instance.invocation(mock, method, [])
@@ -116,6 +116,15 @@ class AssertReceivedTest < Test::Unit::TestCase
     end
   end
 
+  def test_fails_if_invocation_count_too_high
+    method = :a_method
+    mock   = FakeMock.new('a mock')
+    2.times { Mockery.instance.invocation(mock, method, []) }
+    assert_fails do
+      assert_received(mock, method) {|expect| expect.once }
+    end
+  end
+
   def assert_passes(&block)
     assert ! fails?(&block)
   end

data/test/unit/have_received_test.rb

@@ -101,6 +101,24 @@ module HaveReceivedTestMethods
     end
   end
 
+  def test_fails_if_invocation_count_too_low
+    method = :a_method
+    mock   = new_mock('a mock')
+    Mockery.instance.invocation(mock, method, [])
+    assert_fails do
+      assert_matcher_accepts have_received(method).twice, mock
+    end
+  end
+
+  def test_fails_if_invocation_count_too_high
+    method = :a_method
+    mock   = new_mock('a mock')
+    2.times { Mockery.instance.invocation(mock, method, []) }
+    assert_fails do
+      assert_matcher_accepts have_received(method).once, mock
+    end
+  end
+
   def assert_passes(&block)
     assert ! fails?(&block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jferris-mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.0.1240351621
+  version: 0.9.5.0.1241126838
 platform: ruby
 authors: 
 - James Mead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 21:00:00 -07:00
+date: 2009-04-29 21:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency