mocha 0.10.1 → 0.10.2

data/RELEASE.rdoc

@@ -1,5 +1,8 @@
-= 0.10.1 ()
-* Merge pull request #51 from meineerde/issues/50-minitest-2.10.0. Use Gem::Requirement & Gem::Version for version comparison. Fixes issue #50. Thanks to meineerde.
+= 0.10.2 ()
+* Merge pull request #53. Unstubbing a method should not remove expectations for other stubbed methods. Fixes #52. Thanks to saikat.
+
+= 0.10.1 (f631a4ba22c6ed4929c52b0520311a9a84034a20)
+* Merge pull request #51. Use Gem::Requirement & Gem::Version for version comparison. Fixes issue #50. Thanks to meineerde.
 * Fixed typo in rdoc for Mocha::ObjectMethods.
 * Improve README as suggested in issue #46. Explain that Mocha must be loaded after test libraries and how to achieve this using Bundler.
 * Merge pull request #43 - nobody expects the spanish inquisition! Thanks to cairo140.

data/lib/mocha/any_instance_method.rb

@@ -4,12 +4,6 @@ module Mocha
 
   class AnyInstanceMethod < ClassMethod
   
-    def unstub
-      remove_new_method
-      restore_original_method
-      stubbee.any_instance.reset_mocha
-    end
-    
     def mock
       stubbee.any_instance.mocha
     end
@@ -56,4 +50,4 @@ module Mocha
     
   end
   
-end
+end

data/lib/mocha/class_method.rb

@@ -19,7 +19,7 @@ module Mocha
     def unstub
       remove_new_method
       restore_original_method
-      stubbee.reset_mocha
+      mock.unstub(method.to_sym)
     end
 
     def mock

data/lib/mocha/expectation_list.rb

@@ -10,6 +10,10 @@ module Mocha # :nodoc:
       @expectations.unshift(expectation)
       expectation
     end
+
+    def remove_all_matching_method(method_name)
+      @expectations.reject! { |expectation| expectation.matches_method?(method_name) }
+    end
     
     def matches_method?(method_name)
       @expectations.any? { |expectation| expectation.matches_method?(method_name) }

data/lib/mocha/mock.rb

@@ -82,6 +82,10 @@ module Mocha # :nodoc:
       }
     end
 
+    def unstub(method_name)
+      @expectations.remove_all_matching_method(method_name)
+    end
+
     # :call-seq: responds_like(responder) -> mock
     #
     # Constrains the +mock+ so that it can only expect or stub methods to which +responder+ responds. The constraint is only applied at method invocation time.

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/test/acceptance/stub_any_instance_method_test.rb

@@ -84,6 +84,7 @@ class StubAnyInstanceMethodTest < Test::Unit::TestCase
     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
   end
   
@@ -195,4 +196,4 @@ class StubAnyInstanceMethodTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
 
-end
+end

data/test/acceptance/unstubbing_test.rb

@@ -119,4 +119,33 @@ class UnstubbingTest < Test::Unit::TestCase
     assert_passed(test_result)
   end
 
-end
+  def test_unstubbing_a_method_should_not_unstub_other_stubbed_methods
+    klass = Class.new do
+      def my_first_instance_method; :first_return_value; end
+      def my_second_instance_method; :second_return_value; end
+    end
+
+    test_result = run_as_test do
+      object = klass.new
+      object.stubs(:my_first_instance_method).returns(:first_new_return_value)
+      object.stubs(:my_second_instance_method).returns(:second_new_return_value)
+      object.unstub(:my_first_instance_method)
+      assert_equal :first_return_value, object.my_first_instance_method
+      assert_equal :second_new_return_value, object.my_second_instance_method
+    end
+    assert_passed(test_result)
+  end
+
+  def test_unstubbing_a_method_should_remove_all_expectations_for_that_method
+    klass = Class.new do
+      def my_instance_method; :original_return_value; end
+    end
+    test_result = run_as_test do
+      object = klass.new
+      object.expects(:my_instance_method).with(:first)
+      object.expects(:my_instance_method).with(:second)
+      object.unstub(:my_instance_method)
+    end
+    assert_passed(test_result)
+  end
+end

data/test/unit/any_instance_method_test.rb

@@ -73,7 +73,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.stubs(:reset_mocha)
+    any_instance_mocha = Mock.new
+    any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
     method.replace_instance_method(:restore_original_method) { }
@@ -88,7 +89,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.stubs(:reset_mocha)
+    any_instance_mocha = Mock.new
+    any_instance.stubs(:mocha).returns(any_instance_mocha)
     klass.define_instance_method(:any_instance) { any_instance }
     method = AnyInstanceMethod.new(klass, :method_x)
     method.replace_instance_method(:remove_new_method) { }
@@ -100,17 +102,19 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
     assert method.restore_called
   end
 
-  def test_should_call_reset_mocha
+  def test_should_call_mock_unstub
     klass = Class.new { def method_x; end }
-    any_instance = Class.new { attr_accessor :mocha_was_reset; def reset_mocha; self.mocha_was_reset = true; end }.new
-    klass.define_instance_method(:any_instance) { any_instance }
+
     method = AnyInstanceMethod.new(klass, :method_x)
+
     method.replace_instance_method(:remove_new_method) { }
     method.replace_instance_method(:restore_original_method) { }
-    
+    mocha = Class.new { class << self; attr_accessor :unstub_method; end; def self.unstub(method); self.unstub_method = method; end; }
+    method.replace_instance_method(:mock) { mocha }
+
     method.unstub
 
-    assert any_instance.mocha_was_reset
+    assert_equal mocha.unstub_method, :method_x
   end
 
   def test_should_return_any_instance_mocha_for_stubbee
@@ -123,4 +127,4 @@ class AnyInstanceMethodTest < Test::Unit::TestCase
     assert_equal stubbee.any_instance.mocha, method.mock
   end
 
-end
+end

data/test/unit/class_method_test.rb

@@ -154,8 +154,9 @@ class ClassMethodTest < Test::Unit::TestCase
   
   def test_should_call_remove_new_method
     klass = Class.new { def self.method_x; end }
-    klass.define_instance_method(:reset_mocha) { }
     method = ClassMethod.new(klass, :method_x)
+    mocha = Mock.new
+    klass.define_instance_method(:mocha) { mocha }
     method.define_instance_accessor(:remove_called)
     method.replace_instance_method(:remove_new_method) { self.remove_called = true }
     
@@ -166,7 +167,8 @@ class ClassMethodTest < Test::Unit::TestCase
 
   def test_should_call_restore_original_method
     klass = Class.new { def self.method_x; end }
-    klass.define_instance_method(:reset_mocha) { }
+    mocha = Mock.new
+    klass.define_instance_method(:mocha) { mocha }
     method = ClassMethod.new(klass, :method_x)
     method.define_instance_accessor(:restore_called)
     method.replace_instance_method(:restore_original_method) { self.restore_called = true }
@@ -176,16 +178,15 @@ class ClassMethodTest < Test::Unit::TestCase
     assert method.restore_called
   end
 
-  def test_should_call_reset_mocha
+  def test_should_call_mocha_unstub
     klass = Class.new { def self.method_x; end }
-    klass.define_instance_accessor(:reset_called)
-    klass.define_instance_method(:reset_mocha) { self.reset_called = true }
     method = ClassMethod.new(klass, :method_x)
     method.replace_instance_method(:restore_original_method) { }
+    mocha = Class.new { class << self; attr_accessor :unstub_method; end; def self.unstub(method); self.unstub_method = method; end; }
+    method.replace_instance_method(:mock) { mocha }
     
     method.unstub
-    
-    assert klass.reset_called
+    assert_equal mocha.unstub_method, :method_x
   end
   
   def test_should_return_mock_for_stubbee
@@ -234,4 +235,4 @@ class ClassMethodTest < Test::Unit::TestCase
     assert class_method_1.matches?(class_method_2)
   end
   
-end
+end

data/test/unit/expectation_list_test.rb

@@ -22,6 +22,20 @@ class ExpectationListTest < Test::Unit::TestCase
     expectation_list.add(expectation2)
     assert_same expectation1, expectation_list.match(:my_method, :argument1, :argument2)
   end
+
+  def test_should_remove_all_expectations_matching_method_name
+    expectation_list = ExpectationList.new
+    expectation1 = Expectation.new(nil, :method_one).with(:argument1, :argument2)
+    expectation2 = Expectation.new(nil, :method_one).with(:argument3, :argument4)
+    expectation3 = Expectation.new(nil, :method_two)
+    expectation_list.add(expectation1)
+    expectation_list.add(expectation2)
+    expectation_list.add(expectation3)
+    expectation_list.remove_all_matching_method(:method_one)
+    assert_nil expectation_list.match(:method_one, :argument1, :argument2)
+    assert_nil expectation_list.match(:method_one, :argument3, :argument4)
+    assert_same expectation3, expectation_list.match(:method_two)
+  end
   
   def test_should_find_most_recent_matching_expectation
     expectation_list = ExpectationList.new

data/test/unit/mock_test.rb

@@ -27,7 +27,7 @@ class MockTest < Test::Unit::TestCase
     mock = Mock.new
     assert_equal false, mock.everything_stubbed
   end
-  
+
   def test_should_stub_everything
     mock = Mock.new
     mock.stub_everything
@@ -298,5 +298,12 @@ class MockTest < Test::Unit::TestCase
     assert mock.respond_to?(:abc)
     assert mock.respond_to?(:xyz)
   end
-  
-end
+
+  def test_should_remove_expectation_for_unstubbed_method
+    mock = Mock.new
+    mock.expects(:method1)
+    mock.unstub(:method1)
+    e = assert_raises(ExpectationError) { mock.method1 }
+    assert_match(/unexpected invocation/, e.message)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - James Mead
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 +00:00
+date: 2012-01-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency