flexmock 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,5 +1,12 @@
+2006-10-17  Jim Weirich  <jim@weirichhouse.org>
+
 = Changes for FlexMock
 
+== Pre-Version 0.4.2	
+
+* Fixed bug where multiple stubs of a class method were not
+  properly restored.
+	
 == Version 0.4.1
 
 * Removed include of Test::Unit::Assertions from Expectations.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.4.1
+Version :: 0.4.2
 
 = Links
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.4.1'
+PKG_VERSION = '0.4.2'
 
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -27,7 +27,9 @@ RDOC_FILES = FileList[
 ]
 
 
-task :default => [:test]
+task :default => [:test_all]
+task :test_all => [:test]
+task :ta => [:test_all]
 
 # Test Targets -------------------------------------------------------
 

data/lib/flexmock.rb

@@ -973,6 +973,7 @@ class FlexMock
       @mock = mock
       @methods_to_restore = []
       @method_definitions = {}
+      @methods_proxied = []
     end
     
     # Stub out the given method in the existing object and then let the 
@@ -982,7 +983,10 @@ class FlexMock
       if @obj.methods.include?(method_name.to_s)
         @methods_to_restore << method_name
       end
-      hide_existing_method(method_name)
+      unless @methods_proxied.include?(method_name)
+        hide_existing_method(method_name)
+        @methods_proxied << method_name
+      end
       @mock.should_receive(method_name)
     end
     

data/test/test_stubbing.rb

@@ -69,6 +69,17 @@ class TestStubbing < Test::Unit::TestCase
     stub_proxy.mock_teardown
     assert_raise(NoMethodError) { obj.hi }
   end
+
+  def test_multiple_stubs_on_single_method_can_be_restored_missing_method
+    obj = Object.new
+    stub_proxy = flexstub(obj)
+    stub_proxy.should_receive(:hi).with(1).once.and_return(:ok)
+    stub_proxy.should_receive(:hi).with(2).once.and_return(:ok)
+    assert_equal :ok, obj.hi(1)
+    assert_equal :ok, obj.hi(2)
+    stub_proxy.mock_teardown
+    assert_raise(NoMethodError) { obj.hi }
+  end
   
   def test_original_behavior_is_restored_when_multiple_methods_are_mocked
     dog = Dog.new
@@ -96,6 +107,18 @@ class TestStubbing < Test::Unit::TestCase
     assert_equal :hello, obj.hi
   end
 
+  def test_original_behavior_is_restored_on_singleton_methods_with_multiple_stubs
+    obj = Object.new
+    def obj.hi(n) "hello#{n}" end
+    flexstub(obj).should_receive(:hi).with(1).once.and_return(:hola)
+    flexstub(obj).should_receive(:hi).with(2).once.and_return(:hola)
+
+    assert_equal :hola, obj.hi(1)
+    assert_equal :hola, obj.hi(2)
+    flexstub(obj).mock_teardown
+    assert_equal "hello3", obj.hi(3)
+  end
+
   def test_original_behavior_is_restored_even_when_errors
     flexstub(Dog).should_receive(:create).once.and_return(:mock)
     flexmock_teardown rescue nil

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.1
+rubygems_version: 0.9.0.6
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2006-09-07 00:00:00 -04:00
+  version: 0.4.2
+date: 2006-10-18 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
 - lib