jferris-mocha 0.9.5.0.1240002286 → 0.9.5.0.1240351621

data/lib/mocha/api.rb

@@ -149,6 +149,13 @@ module Mocha # :nodoc:
       Mockery.instance.new_state_machine(name)
     end
     
+    # Asserts that the given mock received the given method.
+    #
+    # Examples:
+    #
+    #   assert_received(mock, :to_s)
+    #   assert_received(Radio, :new) {|expect| expect.with(1041) }
+    #   assert_received(radio, :volume) {|expect| expect.with(11).twice }
     def assert_received(mock, expected_method_name)
       matcher = have_received(expected_method_name)
       yield(matcher) if block_given?
@@ -170,7 +177,7 @@ module Mocha # :nodoc:
         if mock.respond_to?(:mocha)
           @mock = mock.mocha
         else
-          mock = @mock
+          @mock = mock
         end
 
         @expectation = Expectation.new(@mock, @expected_method_name)
@@ -204,6 +211,16 @@ module Mocha # :nodoc:
       end
     end
 
+    # :call-seq:
+    #   should have_received(method).with(arguments).times(times)
+    #
+    # Ensures that the given mock received the given method.
+    #
+    # Examples:
+    #
+    #   mock.should have_received(:to_s)
+    #   Radio.should have_received(:new).with(1041)
+    #   radio.should have_received(:volume).with(11).twice
     def have_received(expected_method_name)
       HaveReceived.new(expected_method_name)
     end

data/test/acceptance/spy_test.rb

@@ -2,10 +2,8 @@ require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 require 'mocha'
 require 'matcher_helpers'
 
-class SpyTest < Test::Unit::TestCase
-  
-  include AcceptanceTest
-  
+module SpyTestMethods
+
   def setup
     setup_acceptance_test
   end
@@ -15,7 +13,7 @@ class SpyTest < Test::Unit::TestCase
   end
   
   def test_should_accept_wildcard_stub_call_without_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s
     assert_received(instance, :to_s)
@@ -23,7 +21,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_accept_wildcard_stub_call_with_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s(:argument)
     assert_received(instance, :to_s)
@@ -31,14 +29,14 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_not_accept_wildcard_stub_without_call
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     assert_fails { assert_received(instance, :to_s) }
     assert_fails { assert_matcher_accepts have_received(:to_s), instance }
   end
 
   def test_should_not_accept_call_without_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s
     assert_fails { assert_received(instance, :to_s) {|expect| expect.with(1) } }
@@ -46,7 +44,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_not_accept_call_with_different_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s(2)
     assert_fails { assert_received(instance, :to_s) {|expect| expect.with(1) } }
@@ -54,7 +52,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_accept_call_with_correct_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s(1)
     assert_received(instance, :to_s) {|expect| expect.with(1) }
@@ -62,7 +60,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_accept_call_with_wildcard_arguments
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s('hello')
     assert_received(instance, :to_s) {|expect| expect.with(is_a(String)) }
@@ -70,8 +68,8 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_reject_call_on_different_mock
-    instance = Object.new
-    other    = Object.new
+    instance = new_instance
+    other    = new_instance
     instance.stubs(:to_s)
     other.stubs(:to_s)
     other.to_s('hello')
@@ -80,7 +78,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_accept_correct_number_of_calls
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     2.times { instance.to_s }
     assert_received(instance, :to_s) {|expect| expect.twice }
@@ -88,7 +86,7 @@ class SpyTest < Test::Unit::TestCase
   end
 
   def test_should_reject_incorrect_number_of_calls
-    instance = Object.new
+    instance = new_instance
     instance.stubs(:to_s)
     instance.to_s
     message = /expected exactly twice/
@@ -107,3 +105,21 @@ class SpyTest < Test::Unit::TestCase
   end
 
 end
+
+class PartialSpyTest < Test::Unit::TestCase
+  include AcceptanceTest
+  include SpyTestMethods
+
+  def new_instance
+    Object.new
+  end
+end
+
+class PureSpyTest < Test::Unit::TestCase
+  include AcceptanceTest
+  include SpyTestMethods
+
+  def new_instance
+    stub
+  end
+end

data/test/unit/have_received_test.rb

@@ -5,33 +5,17 @@ require 'mocha/mockery'
 require 'mocha/object'
 require 'matcher_helpers'
 
-class HaveReceivedTest < Test::Unit::TestCase
+module HaveReceivedTestMethods
 
   include Mocha
-  include TestRunner
-  include Mocha::API
 
   def teardown
     Mockery.reset_instance
   end
 
-  class FakeMock
-    def initialize(name)
-      @name = name
-    end
-
-    def inspect
-      @name
-    end
-
-    def mocha
-      self
-    end
-  end
-
   def test_passes_if_invocation_exists
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     Mockery.instance.invocation(mock, method, [])
     assert_passes do
       assert_matcher_accepts have_received(method), mock
@@ -40,7 +24,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_fails_if_invocation_doesnt_exist
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     assert_fails do
       assert_matcher_accepts have_received(method), mock
     end
@@ -48,7 +32,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_fails_if_invocation_exists_with_different_arguments
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     Mockery.instance.invocation(mock, method, [2, 1])
     assert_fails do
       assert_matcher_accepts have_received(method).with(1, 2), mock
@@ -57,7 +41,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_passes_if_invocation_exists_with_wildcard_arguments
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     Mockery.instance.invocation(mock, method, ['hello'])
     assert_passes do
       assert_matcher_accepts have_received(method).with(is_a(String)), mock
@@ -66,7 +50,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_passes_if_invocation_exists_with_exact_arguments
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     Mockery.instance.invocation(mock, method, ['hello'])
     assert_passes do
       assert_matcher_accepts have_received(method).with('hello'), mock
@@ -75,7 +59,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_fails_if_invocation_exists_only_on_other_mock
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     other  = 'another mock'
     Mockery.instance.invocation(other, method, ['hello'])
     assert_fails do
@@ -86,7 +70,7 @@ class HaveReceivedTest < Test::Unit::TestCase
   def test_passes_if_invocation_exists_for_impersonating_mock
     method = :a_method
     object = Object.new
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
 
     class << object
       attr_accessor :mocha
@@ -101,7 +85,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_passes_if_invocation_count_correct
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     2.times { Mockery.instance.invocation(mock, method, []) }
     assert_passes do
       assert_matcher_accepts have_received(method).twice, mock
@@ -110,7 +94,7 @@ class HaveReceivedTest < Test::Unit::TestCase
 
   def test_fails_if_invocation_count_incorrect
     method = :a_method
-    mock   = FakeMock.new('a mock')
+    mock   = new_mock('a mock')
     Mockery.instance.invocation(mock, method, [])
     assert_fails do
       assert_matcher_accepts have_received(method).twice, mock
@@ -135,3 +119,56 @@ class HaveReceivedTest < Test::Unit::TestCase
   end
 
 end
+
+class PartialHaveReceivedTest < Test::Unit::TestCase
+
+  include TestRunner
+  include Mocha::API
+  include HaveReceivedTestMethods
+
+  class FakeMock
+    def initialize(name)
+      @name = name
+    end
+
+    def inspect
+      @name
+    end
+
+    def mocha
+      self
+    end
+  end
+
+  def new_mock(*args)
+    FakeMock.new(*args)
+  end
+
+end
+
+
+class PureHaveReceivedTest < Test::Unit::TestCase
+
+  include TestRunner
+  include Mocha::API
+  include HaveReceivedTestMethods
+
+  class FakeMock
+    def initialize(name)
+      @name = name
+    end
+
+    def inspect
+      @name
+    end
+
+    def mocha
+      self
+    end
+  end
+
+  def new_mock(*args)
+    Mocha::Mock.new(*args)
+  end
+
+end

metadata

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