mocha 0.10.4 → 0.10.5

data/README.rdoc

@@ -1,4 +1,4 @@
-= Mocha
+= Mocha {<img src="https://secure.travis-ci.org/floehopper/mocha.png" />}[http://travis-ci.org/floehopper/mocha]
 
 Mocha is a library for mocking and stubbing using a syntax like that of {JMock}[http://www.jmock.org].
 
@@ -8,10 +8,6 @@ Mocha provides a unified, simple and readable syntax for both traditional mockin
 
 Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com/] by me ({James}[http://jamesmead.org/]) and my (then) colleagues {Ben}[http://www.techbelly.com/], {Chris}[http://chrisroos.co.uk/] and {Paul}[http://po-ru.com/].
 
-== Build Status
-
-https://secure.travis-ci.org/floehopper/mocha.png
-
 == Installation
 
 Install the latest version of the gem with the following command...
@@ -38,10 +34,6 @@ Or install the {Rails}[http://www.rubyonrails.org/] plugin...
 
 Note that versions 0.9.6 & 0.9.7 of the Rails plugin were broken. As of version 0.9.8, you need to explicitly load Mocha after the test framework e.g. by adding "require 'mocha'" at the bottom of test/test_helper.rb.
 
-Or download Mocha...
-
-  http://rubyforge.org/frs/?group_id=1917
-
 == Examples
 
 * Quick Start - {Usage Examples}[http://mocha.rubyforge.org/examples/misc.html]
@@ -50,6 +42,11 @@ Or download Mocha...
 * More examples on {James Mead's Blog}[http://jamesmead.org/blog/]
 * {Mailing List Archives}[http://groups.google.com/group/mocha-developer]
 
+== Links
+
+* {Source code}[http://github.com/floehopper/mocha]
+* {Bug reports}[http://github.com/floehopper/mocha/issues]
+
 == License
 
 Copyright Revieworld Ltd. 2006

data/RELEASE.rdoc

@@ -1,5 +1,12 @@
-= 0.10.4 ()
-* Fix for issue #65 - expectations not being verified in subsequent tests
+= 0.10.5 (a5a64cf9755b21d4a30e446232654d1c0fc6f151)
+* Fix for issue #66 (hopefully without regressing on issue #63) - Mocha::Mock has Mocha::Mockery as a dependency. Stop trying to pretend otherwise. Thanks to @kennyj for reporting.
+* Fix a bunch of warnings in Ruby 1.9. There are still the 6 test failures mentioned in issue #41 which I suspect are due to the introspection gem not being Ruby 1.9-compatible.
+* Add links to README for source code & issue tracker.
+* Fix for issue #67 - Make the travis-ci badge visible in the README. Thanks to Diego Plentz for pull request.
+* Fix for issue #70 - Rename Mock#expectations to Mock#__expectations__ to avoid conflicts. Thanks to Jeremy Stephens for pull request.
+
+= 0.10.4 (babdd656c361ac65f25948104adf612e59174a5e)
+* Fix for issue #65 - expectations not being verified in subsequent tests.
 * Fix for issue #63 - require Mocha::Mockery at Mocha::Mock class load time and not on invocation of Mock#method_missing.
 * Fix for issue #45 - raise ArgumentError if Mocha::ParameterMatchers#has_entry is given
 Hash with wrong number of entries.

data/lib/mocha/mock.rb

@@ -6,7 +6,6 @@ require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
 require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
-require 'mocha/mockery'
 
 module Mocha # :nodoc:
 
@@ -134,7 +133,8 @@ module Mocha # :nodoc:
 
     # :stopdoc:
 
-    def initialize(name = nil, &block)
+    def initialize(mockery, name = nil, &block)
+      @mockery = mockery
       @name = name || DefaultName.new(self)
       @expectations = ExpectationList.new
       @everything_stubbed = false
@@ -142,7 +142,7 @@ module Mocha # :nodoc:
       instance_eval(&block) if block
     end
 
-    attr_reader :everything_stubbed, :expectations
+    attr_reader :everything_stubbed
 
     alias_method :__expects__, :expects
 
@@ -150,6 +150,10 @@ module Mocha # :nodoc:
 
     alias_method :quacks_like, :responds_like
 
+    def __expectations__
+      @expectations
+    end
+
     def stub_everything
       @everything_stubbed = true
     end
@@ -164,7 +168,7 @@ module Mocha # :nodoc:
         if (matching_expectation = @expectations.match(symbol, *arguments)) || (!matching_expectation && !@everything_stubbed)
           matching_expectation.invoke(&block) if matching_expectation
           message = UnexpectedInvocation.new(self, symbol, *arguments).to_s
-          message << Mockery.instance.mocha_inspect
+          message << @mockery.mocha_inspect
           raise ExpectationError.new(message, caller)
         end
       end

data/lib/mocha/mockery.rb

@@ -23,19 +23,19 @@ module Mocha
     end
     
     def named_mock(name, &block)
-      add_mock(Mock.new(Name.new(name), &block))
+      add_mock(Mock.new(self, Name.new(name), &block))
     end
     
     def unnamed_mock(&block)
-      add_mock(Mock.new(&block))
+      add_mock(Mock.new(self, &block))
     end
     
     def mock_impersonating(object, &block)
-      add_mock(Mock.new(ImpersonatingName.new(object), &block))
+      add_mock(Mock.new(self, ImpersonatingName.new(object), &block))
     end
     
     def mock_impersonating_any_instance_of(klass, &block)
-      add_mock(Mock.new(ImpersonatingAnyInstanceName.new(klass), &block))
+      add_mock(Mock.new(self, ImpersonatingAnyInstanceName.new(klass), &block))
     end
     
     def new_state_machine(name)
@@ -149,7 +149,7 @@ module Mocha
     private
     
     def expectations
-      mocks.map { |mock| mock.expectations.to_a }.flatten
+      mocks.map { |mock| mock.__expectations__.to_a }.flatten
     end
     
     def unsatisfied_expectations

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.10.4"
+  VERSION = "0.10.5"
 end

data/test/acceptance/issue_70_test.rb

@@ -0,0 +1,55 @@
+require File.expand_path('../acceptance_test_helper', __FILE__)
+require 'mocha'
+
+class Issue70Test < Test::Unit::TestCase
+
+  include AcceptanceTest
+
+  def setup
+    setup_acceptance_test
+  end
+
+  def teardown
+    teardown_acceptance_test
+  end
+
+  def test_should_stub_expectations_instance_method
+    instance = Class.new do
+      def expectations
+        :original_return_value
+      end
+    end.new
+    test_result = run_as_test do
+      instance.stubs(:expectations).returns(:stubbed_return_value)
+      assert_equal :stubbed_return_value, instance.expectations
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_stub_expectations_class_method
+    klass = Class.new do
+      def self.expectations
+        :original_return_value
+      end
+    end
+    test_result = run_as_test do
+      klass.stubs(:expectations).returns(:stubbed_return_value)
+      assert_equal :stubbed_return_value, klass.expectations
+    end
+    assert_passed(test_result)
+  end
+
+  def test_should_stub_expectations_any_instance_method
+    klass = Class.new do
+      def expectations
+        :original_return_value
+      end
+    end
+    instance = klass.new
+    test_result = run_as_test do
+      klass.any_instance.stubs(:expectations).returns(:stubbed_return_value)
+      assert_equal :stubbed_return_value, instance.expectations
+    end
+    assert_passed(test_result)
+  end
+end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -80,12 +80,11 @@ class StubAnyInstanceMethodTest < Test::Unit::TestCase
         :original_return_value
       end
     end
-    instance = klass.new
     run_as_test do
       klass.any_instance.stubs(:my_instance_method).returns(:new_return_value)
     end
 
-    assert_equal 0, klass.any_instance.mocha.expectations.length
+    assert_equal 0, klass.any_instance.mocha.__expectations__.length
   end
   
   def test_should_be_able_to_stub_a_superclass_method

data/test/acceptance/stub_module_method_test.rb

@@ -54,7 +54,7 @@ class StubModuleMethodTest < Test::Unit::TestCase
     run_as_test do
       mod.stubs(:my_module_method)
     end
-    assert_equal 0, mod.mocha.expectations.length
+    assert_equal 0, mod.mocha.__expectations__.length
   end  
   
   def test_should_be_able_to_stub_a_superclass_method
@@ -160,4 +160,4 @@ class StubModuleMethodTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
   
-end
+end

data/test/unit/any_instance_method_test.rb

@@ -30,7 +30,7 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
   def test_should_define_a_new_method
     klass = Class.new { def method_x; end } 
     method = AnyInstanceMethod.new(klass, :method_x)
-    mocha = Mock.new
+    mocha = build_mock
     mocha.expects(:method_x).with(:param1, :param2).returns(:result)
     any_instance = Object.new
     any_instance.define_instance_method(:mocha) { mocha }
@@ -72,8 +72,8 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
 
   def test_should_call_remove_new_method
     klass = Class.new { def method_x; end }
-    any_instance = Mock.new
-    any_instance_mocha = Mock.new
+    any_instance = build_mock
+    any_instance_mocha = build_mock
     any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
@@ -88,8 +88,8 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
 
   def test_should_call_restore_original_method
     klass = Class.new { def method_x; end }
-    any_instance = Mock.new
-    any_instance_mocha = Mock.new
+    any_instance = build_mock
+    any_instance_mocha = build_mock
     any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
@@ -128,4 +128,9 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
     assert_equal stubbee.any_instance.mocha, method.mock
   end
 
+  private
+
+  def build_mock
+    Mock.new(nil)
+  end
 end

data/test/unit/central_test.rb

@@ -15,7 +15,7 @@ class CentralTest < Test::Unit::TestCase
   end
   
   def test_should_stub_method_if_not_already_stubbed
-    method = Mock.new
+    method = build_mock
     method.expects(:stub)
     stubba = Central.new
     
@@ -25,7 +25,7 @@ class CentralTest < Test::Unit::TestCase
   end
   
   def test_should_not_stub_method_if_already_stubbed
-    method = Mock.new
+    method = build_mock
     method.stubs(:matches?).returns(true)
     method.expects(:stub).times(0)
     stubba = Central.new
@@ -37,7 +37,7 @@ class CentralTest < Test::Unit::TestCase
   end
   
   def test_should_record_method
-    method = Mock.new
+    method = build_mock
     method.expects(:stub)
     stubba = Central.new
     
@@ -48,9 +48,9 @@ class CentralTest < Test::Unit::TestCase
   
   def test_should_unstub_specified_method
     stubba = Central.new
-    method_1 = Mock.new
+    method_1 = build_mock
     method_1.stubs(:matches?).returns(false)
-    method_2 = Mock.new
+    method_2 = build_mock
     method_2.stubs(:matches?).returns(true)
     method_2.expects(:unstub)
     stubba.stubba_methods = [method_1, method_2]
@@ -63,9 +63,9 @@ class CentralTest < Test::Unit::TestCase
   
   def test_should_not_unstub_specified_method_if_not_already_stubbed
     stubba = Central.new
-    method_1 = Mock.new
+    method_1 = build_mock
     method_1.stubs(:matches?).returns(false)
-    method_2 = Mock.new
+    method_2 = build_mock
     method_2.expects(:unstub).never
     stubba.stubba_methods = [method_1]
 
@@ -77,10 +77,10 @@ class CentralTest < Test::Unit::TestCase
   
   def test_should_unstub_all_methods
     stubba = Central.new
-    method_1 = Mock.new
+    method_1 = build_mock
     method_1.stubs(:matches?).returns(true)
     method_1.expects(:unstub)
-    method_2 = Mock.new
+    method_2 = build_mock
     method_2.stubs(:matches?).returns(true)
     method_2.expects(:unstub)
     stubba.stubba_methods = [method_1, method_2]
@@ -91,5 +91,10 @@ class CentralTest < Test::Unit::TestCase
     assert method_1.__verified__?
     assert method_2.__verified__?
   end
-  
+
+  private
+
+  def build_mock
+    Mock.new(nil)
+  end
 end

data/test/unit/class_method_test.rb

@@ -66,7 +66,6 @@ class ClassMethodTest < Test::Unit::TestCase
   def test_should_respond_to_original_method_name_after_original_method_has_been_hidden
     klass = Class.new { def self.original_method_name; end }
     method = ClassMethod.new(klass, :original_method_name)
-    hidden_method_x = method.hidden_method
     
     method.hide_original_method
 
@@ -85,7 +84,7 @@ class ClassMethodTest < Test::Unit::TestCase
   
   def test_should_define_a_new_method_which_should_call_mocha_method_missing
     klass = Class.new { def self.method_x; end }
-    mocha = Mocha::Mock.new
+    mocha = build_mock
     klass.define_instance_method(:mocha) { mocha }
     mocha.expects(:method_x).with(:param1, :param2).returns(:result)
     method = ClassMethod.new(klass, :method_x)
@@ -155,7 +154,7 @@ class ClassMethodTest < Test::Unit::TestCase
   def test_should_call_remove_new_method
     klass = Class.new { def self.method_x; end }
     method = ClassMethod.new(klass, :method_x)
-    mocha = Mock.new
+    mocha = build_mock
     klass.define_instance_method(:mocha) { mocha }
     method.define_instance_accessor(:remove_called)
     method.replace_instance_method(:remove_new_method) { self.remove_called = true }
@@ -167,7 +166,7 @@ class ClassMethodTest < Test::Unit::TestCase
 
   def test_should_call_restore_original_method
     klass = Class.new { def self.method_x; end }
-    mocha = Mock.new
+    mocha = build_mock
     klass.define_instance_method(:mocha) { mocha }
     method = ClassMethod.new(klass, :method_x)
     method.define_instance_accessor(:restore_called)
@@ -196,7 +195,7 @@ class ClassMethodTest < Test::Unit::TestCase
     method.replace_instance_method(:remove_new_method) { }
     method.replace_instance_method(:restore_original_method) { }
     mocha = Class.new
-    mocha.define_instance_method(:unstub) { }
+    mocha.define_instance_method(:unstub) { |method_name| }
     mocha.define_instance_method(:any_expectations?) { false }
     method.replace_instance_method(:mock) { mocha }
     stubbee = Class.new { attr_accessor :reset_mocha_called; def reset_mocha; self.reset_mocha_called = true; end; }.new
@@ -252,5 +251,10 @@ class ClassMethodTest < Test::Unit::TestCase
     class_method_2 = ClassMethod.new(stubbee, :method)
     assert class_method_1.matches?(class_method_2)
   end
-  
+
+  private
+
+  def build_mock
+    Mock.new(nil)
+  end
 end

data/test/unit/mock_test.rb

@@ -9,7 +9,7 @@ class MockTest < Test::Unit::TestCase
   include Mocha
   
   def test_should_set_single_expectation
-   mock = Mock.new
+   mock = build_mock
    mock.expects(:method1).returns(1)
    assert_nothing_raised(ExpectationError) do
      assert_equal 1, mock.method1
@@ -17,30 +17,30 @@ class MockTest < Test::Unit::TestCase
   end 
 
   def test_should_build_and_store_expectations
-   mock = Mock.new
+   mock = build_mock
    expectation = mock.expects(:method1)
    assert_not_nil expectation
-   assert_equal [expectation], mock.expectations.to_a
+   assert_equal [expectation], mock.__expectations__.to_a
   end
   
   def test_should_not_stub_everything_by_default
-    mock = Mock.new
+    mock = build_mock
     assert_equal false, mock.everything_stubbed
   end
 
   def test_should_stub_everything
-    mock = Mock.new
+    mock = build_mock
     mock.stub_everything
     assert_equal true, mock.everything_stubbed
   end
   
   def test_should_be_able_to_extend_mock_object_with_module
-    mock = Mock.new
+    mock = build_mock
     assert_nothing_raised(ExpectationError) { mock.extend(Module.new) }
   end
   
   def test_should_be_equal
-    mock = Mock.new
+    mock = build_mock
     assert_equal true, mock.eql?(mock)
   end
   
@@ -51,55 +51,55 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_be_able_to_mock_standard_object_methods
-    mock = Mock.new
+    mock = build_mock
     OBJECT_METHODS.each { |method| mock.__expects__(method.to_sym).returns(method) }
     OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
     assert mock.__verified__?
   end
   
   def test_should_be_able_to_stub_standard_object_methods
-    mock = Mock.new
+    mock = build_mock
     OBJECT_METHODS.each { |method| mock.__stubs__(method.to_sym).returns(method) }
     OBJECT_METHODS.each { |method| assert_equal method, mock.__send__(method.to_sym) }
   end
   
   def test_should_create_and_add_expectations
-    mock = Mock.new
+    mock = build_mock
     expectation1 = mock.expects(:method1)
     expectation2 = mock.expects(:method2)
-    assert_equal [expectation1, expectation2].to_set, mock.expectations.to_set
+    assert_equal [expectation1, expectation2].to_set, mock.__expectations__.to_set
   end
   
   def test_should_pass_backtrace_into_expectation
-    mock = Mock.new
+    mock = build_mock
     backtrace = Object.new
     expectation = mock.expects(:method1, backtrace)
     assert_equal backtrace, expectation.backtrace
   end
   
   def test_should_pass_backtrace_into_stub
-    mock = Mock.new
+    mock = build_mock
     backtrace = Object.new
     stub = mock.stubs(:method1, backtrace)
     assert_equal backtrace, stub.backtrace
   end
   
   def test_should_create_and_add_stubs
-    mock = Mock.new
+    mock = build_mock
     stub1 = mock.stubs(:method1)
     stub2 = mock.stubs(:method2)
-    assert_equal [stub1, stub2].to_set, mock.expectations.to_set
+    assert_equal [stub1, stub2].to_set, mock.__expectations__.to_set
   end
   
   def test_should_invoke_expectation_and_return_result
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:my_method).returns(:result)
     result = mock.my_method
     assert_equal :result, result
   end
   
   def test_should_not_raise_error_if_stubbing_everything
-    mock = Mock.new
+    mock = build_mock
     mock.stub_everything
     result = nil
     assert_nothing_raised(ExpectationError) do
@@ -109,7 +109,7 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_raise_assertion_error_for_unexpected_method_call
-    mock = Mock.new
+    mock = build_mock
     error = assert_raise(ExpectationError) do
       mock.unexpected_method_called(:my_method, :argument1, :argument2)
     end
@@ -120,7 +120,7 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_not_verify_successfully_because_not_all_expectations_have_been_satisfied
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1)
     mock.expects(:method2)
     mock.method1
@@ -128,7 +128,7 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_increment_assertion_counter_for_every_verified_expectation
-    mock = Mock.new
+    mock = build_mock
     
     mock.expects(:method1)
     mock.method1
@@ -144,7 +144,7 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_yield_supplied_parameters_to_block
-    mock = Mock.new
+    mock = build_mock
     parameters_for_yield = [1, 2, 3]
     mock.expects(:method1).yields(*parameters_for_yield)
     yielded_parameters = nil
@@ -153,69 +153,69 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_set_up_multiple_expectations_with_return_values
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1 => :result1, :method2 => :result2)
     assert_equal :result1, mock.method1
     assert_equal :result2, mock.method2
   end
   
   def test_should_set_up_multiple_stubs_with_return_values
-    mock = Mock.new
+    mock = build_mock
     mock.stubs(:method1 => :result1, :method2 => :result2)
     assert_equal :result1, mock.method1
     assert_equal :result2, mock.method2
   end
   
   def test_should_keep_returning_specified_value_for_stubs
-    mock = Mock.new
+    mock = build_mock
     mock.stubs(:method1).returns(1)
     assert_equal 1, mock.method1
     assert_equal 1, mock.method1
   end
   
   def test_should_keep_returning_specified_value_for_expects
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1).times(2).returns(1)
     assert_equal 1, mock.method1
     assert_equal 1, mock.method1
   end
   
   def test_should_match_most_recent_call_to_expects
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1).returns(0)
     mock.expects(:method1).returns(1)
     assert_equal 1, mock.method1
   end
 
   def test_should_match_most_recent_call_to_stubs
-    mock = Mock.new
+    mock = build_mock
     mock.stubs(:method1).returns(0)
     mock.stubs(:method1).returns(1)
     assert_equal 1, mock.method1
   end
 
   def test_should_match_most_recent_call_to_stubs_or_expects
-    mock = Mock.new
+    mock = build_mock
     mock.stubs(:method1).returns(0)
     mock.expects(:method1).returns(1)
     assert_equal 1, mock.method1
   end
 
   def test_should_match_most_recent_call_to_expects_or_stubs
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1).returns(0)
     mock.stubs(:method1).returns(1)
     assert_equal 1, mock.method1
   end
   
   def test_should_respond_to_expected_method
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1)
     assert_equal true, mock.respond_to?(:method1)
   end
   
   def test_should_not_respond_to_unexpected_method
-    mock = Mock.new
+    mock = build_mock
     assert_equal false, mock.respond_to?(:method1)
   end
   
@@ -223,7 +223,7 @@ class MockTest < Test::Unit::TestCase
     instance = Class.new do
       define_method(:respond_to?) { |symbol| true }
     end.new
-    mock = Mock.new
+    mock = build_mock
     mock.responds_like(instance)
     assert_equal true, mock.respond_to?(:invoked_method)
   end
@@ -232,21 +232,18 @@ class MockTest < Test::Unit::TestCase
     instance = Class.new do
       define_method(:respond_to?) { |symbol| false }
     end.new
-    mock = Mock.new
+    mock = build_mock
     mock.responds_like(instance)
     assert_equal false, mock.respond_to?(:invoked_method)
   end
   
   def test_should_return_itself_to_allow_method_chaining
-    mock = Mock.new
+    mock = build_mock
     assert_same mock.responds_like(Object.new), mock
   end
   
   def test_should_not_raise_no_method_error_if_mock_is_not_restricted_to_respond_like_a_responder
-    instance = Class.new do
-      define_method(:respond_to?) { true }
-    end.new
-    mock = Mock.new
+    mock = build_mock
     mock.stubs(:invoked_method)
     assert_nothing_raised(NoMethodError) { mock.invoked_method }
   end
@@ -255,7 +252,7 @@ class MockTest < Test::Unit::TestCase
     instance = Class.new do
       define_method(:respond_to?) { |symbol| true }
     end.new
-    mock = Mock.new
+    mock = build_mock
     mock.responds_like(instance)
     mock.stubs(:invoked_method)
     assert_nothing_raised(NoMethodError) { mock.invoked_method }
@@ -266,7 +263,7 @@ class MockTest < Test::Unit::TestCase
       define_method(:respond_to?) { |symbol| false }
       define_method(:mocha_inspect) { 'mocha_inspect' }
     end.new
-    mock = Mock.new
+    mock = build_mock
     mock.responds_like(instance)
     mock.stubs(:invoked_method)
     assert_raises(NoMethodError) { mock.invoked_method }
@@ -277,7 +274,7 @@ class MockTest < Test::Unit::TestCase
       define_method(:respond_to?) { |symbol| false }
       define_method(:mocha_inspect) { 'mocha_inspect' }
     end.new
-    mock = Mock.new
+    mock = build_mock
     mock.responds_like(instance)
     mock.stubs(:invoked_method)
     begin
@@ -288,22 +285,28 @@ class MockTest < Test::Unit::TestCase
   end
   
   def test_should_handle_respond_to_with_private_methods_param_without_error
-    mock = Mock.new
+    mock = build_mock
     assert_nothing_raised{ mock.respond_to?(:object_id, false) }
   end
   
   def test_should_respond_to_any_method_if_stubbing_everything
-    mock = Mock.new
+    mock = build_mock
     mock.stub_everything
     assert mock.respond_to?(:abc)
     assert mock.respond_to?(:xyz)
   end
 
   def test_should_remove_expectation_for_unstubbed_method
-    mock = Mock.new
+    mock = build_mock
     mock.expects(:method1)
     mock.unstub(:method1)
     e = assert_raises(ExpectationError) { mock.method1 }
     assert_match(/unexpected invocation/, e.message)
   end
+
+  private
+
+  def build_mock
+    Mock.new(nil)
+  end
 end

data/test/unit/mockery_test.rb

@@ -36,7 +36,7 @@ class MockeryTest < Test::Unit::TestCase
   
   def test_should_reset_list_of_mocks_on_teardown
     mockery = Mockery.new
-    mock = mockery.unnamed_mock { expects(:my_method) }
+    mockery.unnamed_mock { expects(:my_method) }
     mockery.teardown
     assert_nothing_raised(ExpectationError) { mockery.verify }
   end

data/test/unit/parameters_matcher_test.rb

@@ -7,85 +7,85 @@ class ParametersMatcherTest < Test::Unit::TestCase
 
   def test_should_match_any_actual_parameters_if_no_expected_parameters_specified
     parameters_matcher = ParametersMatcher.new
-    assert parameters_matcher.match?(actual_parameters = [1, 2, 3])
+    assert parameters_matcher.match?([1, 2, 3])
   end
 
   def test_should_match_if_actual_parameters_are_same_as_expected_parameters
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, 6])
-    assert parameters_matcher.match?(actual_parameters = [4, 5, 6])
+    parameters_matcher = ParametersMatcher.new([4, 5, 6])
+    assert parameters_matcher.match?([4, 5, 6])
   end
   
   def test_should_not_match_if_actual_parameters_are_different_from_expected_parameters
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, 6])
-    assert !parameters_matcher.match?(actual_parameters = [1, 2, 3])
+    parameters_matcher = ParametersMatcher.new([4, 5, 6])
+    assert !parameters_matcher.match?([1, 2, 3])
   end
   
   def test_should_not_match_if_there_are_less_actual_parameters_than_expected_parameters
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, 6])
-    assert !parameters_matcher.match?(actual_parameters = [4, 5])
+    parameters_matcher = ParametersMatcher.new([4, 5, 6])
+    assert !parameters_matcher.match?([4, 5])
   end
   
   def test_should_not_match_if_there_are_more_actual_parameters_than_expected_parameters
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5])
-    assert !parameters_matcher.match?(actual_parameters = [4, 5, 6])
+    parameters_matcher = ParametersMatcher.new([4, 5])
+    assert !parameters_matcher.match?([4, 5, 6])
   end
   
   def test_should_not_match_if_not_all_required_parameters_are_supplied
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert !parameters_matcher.match?(actual_parameters = [4])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert !parameters_matcher.match?([4])
   end
   
   def test_should_match_if_all_required_parameters_match_and_no_optional_parameters_are_supplied
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert parameters_matcher.match?(actual_parameters = [4, 5])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert parameters_matcher.match?([4, 5])
   end
   
   def test_should_match_if_all_required_and_optional_parameters_match_and_some_optional_parameters_are_supplied
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert parameters_matcher.match?(actual_parameters = [4, 5, 6])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert parameters_matcher.match?([4, 5, 6])
   end
   
   def test_should_match_if_all_required_and_optional_parameters_match_and_all_optional_parameters_are_supplied
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert parameters_matcher.match?(actual_parameters = [4, 5, 6, 7])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert parameters_matcher.match?([4, 5, 6, 7])
   end
   
   def test_should_not_match_if_all_required_and_optional_parameters_match_but_too_many_optional_parameters_are_supplied
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert !parameters_matcher.match?(actual_parameters = [4, 5, 6, 7, 8])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert !parameters_matcher.match?([4, 5, 6, 7, 8])
   end
   
   def test_should_not_match_if_all_required_parameters_match_but_some_optional_parameters_do_not_match
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert !parameters_matcher.match?(actual_parameters = [4, 5, 6, 0])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert !parameters_matcher.match?([4, 5, 6, 0])
   end
 
   def test_should_not_match_if_some_required_parameters_do_not_match_although_all_optional_parameters_do_match
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert !parameters_matcher.match?(actual_parameters = [4, 0, 6])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert !parameters_matcher.match?([4, 0, 6])
   end
 
   def test_should_not_match_if_all_required_parameters_match_but_no_optional_parameters_match
     optionals = ParameterMatchers::Optionally.new(6, 7)
-    parameters_matcher = ParametersMatcher.new(expected_parameters = [4, 5, optionals])
-    assert !parameters_matcher.match?(actual_parameters = [4, 5, 0, 0])
+    parameters_matcher = ParametersMatcher.new([4, 5, optionals])
+    assert !parameters_matcher.match?([4, 5, 0, 0])
   end
 
   def test_should_match_if_actual_parameters_satisfy_matching_block
     parameters_matcher = ParametersMatcher.new { |x, y| x + y == 3 }
-    assert parameters_matcher.match?(actual_parameters = [1, 2])
+    assert parameters_matcher.match?([1, 2])
   end
 
   def test_should_not_match_if_actual_parameters_do_not_satisfy_matching_block
     parameters_matcher = ParametersMatcher.new { |x, y| x + y == 3 }
-    assert !parameters_matcher.match?(actual_parameters = [2, 3])
+    assert !parameters_matcher.match?([2, 3])
   end
   
   def test_should_remove_outer_array_braces

data/test/unit/sequence_test.rb

@@ -32,29 +32,29 @@ class SequenceTest < Test::Unit::TestCase
 
   def test_should_be_satisfied_if_one_unsatisfied_expectations_added_but_it_is_not_included_by_index
     sequence = Sequence.new('name')
-    expectation = FakeExpectation.new(satisfied = false)
+    expectation = FakeExpectation.new(false)
     sequence.constrain_as_next_in_sequence(expectation)
     assert sequence.satisfied_to_index?(0)
   end
 
   def test_should_not_be_satisfied_if_one_unsatisfied_expectations_added_and_it_is_included_by_index
     sequence = Sequence.new('name')
-    expectation = FakeExpectation.new(satisfied = false)
+    expectation = FakeExpectation.new(false)
     sequence.constrain_as_next_in_sequence(expectation)
     assert !sequence.satisfied_to_index?(1)
   end
 
   def test_should_be_satisfied_if_one_satisfied_expectations_added_and_it_is_included_by_index
     sequence = Sequence.new('name')
-    expectation = FakeExpectation.new(satisfied = true)
+    expectation = FakeExpectation.new(true)
     sequence.constrain_as_next_in_sequence(expectation)
     assert sequence.satisfied_to_index?(1)
   end
 
   def test_should_not_be_satisfied_if_one_satisfied_and_one_unsatisfied_expectation_added_and_both_are_included_by_index
     sequence = Sequence.new('name')
-    expectation_one = FakeExpectation.new(satisfied = true)
-    expectation_two = FakeExpectation.new(satisfied = false)
+    expectation_one = FakeExpectation.new(true)
+    expectation_two = FakeExpectation.new(false)
     sequence.constrain_as_next_in_sequence(expectation_one)
     sequence.constrain_as_next_in_sequence(expectation_two)
     assert !sequence.satisfied_to_index?(2)
@@ -62,8 +62,8 @@ class SequenceTest < Test::Unit::TestCase
 
   def test_should_be_satisfied_if_two_satisfied_expectations_added_and_both_are_included_by_index
     sequence = Sequence.new('name')
-    expectation_one = FakeExpectation.new(satisfied = true)
-    expectation_two = FakeExpectation.new(satisfied = true)
+    expectation_one = FakeExpectation.new(true)
+    expectation_two = FakeExpectation.new(true)
     sequence.constrain_as_next_in_sequence(expectation_one)
     sequence.constrain_as_next_in_sequence(expectation_two)
     assert sequence.satisfied_to_index?(2)
@@ -78,8 +78,8 @@ class SequenceTest < Test::Unit::TestCase
 
   def test_should_not_allow_invocation_of_second_method_when_first_n_sequence_has_not_been_invoked
     sequence = Sequence.new('name')
-    expectation_one = FakeExpectation.new(satisfied = false)
-    expectation_two = FakeExpectation.new(satisfied = false)
+    expectation_one = FakeExpectation.new(false)
+    expectation_two = FakeExpectation.new(false)
     sequence.constrain_as_next_in_sequence(expectation_one)
     sequence.constrain_as_next_in_sequence(expectation_two)
     assert !expectation_two.ordering_constraints[0].allows_invocation_now?
@@ -87,8 +87,8 @@ class SequenceTest < Test::Unit::TestCase
 
   def test_should_allow_invocation_of_second_method_when_first_in_sequence_has_been_invoked
     sequence = Sequence.new('name')
-    expectation_one = FakeExpectation.new(satisfied = true)
-    expectation_two = FakeExpectation.new(satisfied = false)
+    expectation_one = FakeExpectation.new(true)
+    expectation_two = FakeExpectation.new(false)
     sequence.constrain_as_next_in_sequence(expectation_one)
     sequence.constrain_as_next_in_sequence(expectation_two)
     assert expectation_two.ordering_constraints[0].allows_invocation_now?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 10
-  - 4
-  version: 0.10.4
+  - 5
+  version: 0.10.5
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 +00:00
+date: 2012-02-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -223,6 +223,7 @@ files:
 - test/acceptance/expected_invocation_count_test.rb
 - test/acceptance/failure_messages_test.rb
 - test/acceptance/issue_65_test.rb
+- test/acceptance/issue_70_test.rb
 - test/acceptance/minitest_test.rb
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/mocha_test_result_test.rb