flexmock 0.4.2 → 0.4.3

data/CHANGELOG

@@ -2,7 +2,11 @@
 
 = Changes for FlexMock
 
-== Pre-Version 0.4.2	
+== Version 0.4.3
+
+* Fixed bug where non-direct class methods were not properly handled.
+	
+== Version 0.4.2
 
 * Fixed bug where multiple stubs of a class method were not
   properly restored.

data/README

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

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.4.2'
+PKG_VERSION = '0.4.3'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/doc/releases/flexmock-0.4.2.rdoc

@@ -0,0 +1,87 @@
+= FlexMock 0.4.2 Released
+
+FlexMock is a flexible mocking library for use in Ruby's Test::Unit
+test framework.  Version 0.4.0 enhances FlexMock with the ability to
+stub and mock methods in existing objects.
+
+== New in 0.4.2
+
+Release 0.4.2 contains a fix for multiple definitions of a class
+method stub so that the correct original definition is retained.
+
+== What is FlexMock?
+
+FlexMock is a flexible Ruby mocking library that works with Ruby's
+Test::Unit framework to create easy to use mocks.
+
+=== Features
+
+* Easy integration with Test::Unit.  Mocks created with the flexmock
+  method are automatically verified at the end of the test.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock'
+
+  class TestDog < Test::Unit::TestCase
+    include FlexMock::TestCase
+
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object
+received the message +wag+ exactly one time.  If it doesn't, the test
+will not pass.
+
+See the FlexMock documentation at
+http://onestepback.org/software/flexmock for details on specifying
+arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail
+objects directly.
+
+== Availability
+
+FlexMock is distributed with Rails, or you can make sure you have the
+latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at:
+http://onestepback.org/software/flexmock/
+
+-- Jim Weirich

data/doc/releases/flexmock-0.4.3.rdoc

@@ -0,0 +1,87 @@
+= FlexMock 0.4.3 Released
+
+FlexMock is a flexible mocking library for use in Ruby's Test::Unit
+test framework.  Version 0.4.0 enhances FlexMock with the ability to
+stub and mock methods in existing objects.
+
+== New in 0.4.3
+
+Release 0.4.3 contains a fix for handling non-direct class methods
+properly (bug report from Scott Barron).
+
+== What is FlexMock?
+
+FlexMock is a flexible Ruby mocking library that works with Ruby's
+Test::Unit framework to create easy to use mocks.
+
+=== Features
+
+* Easy integration with Test::Unit.  Mocks created with the flexmock
+  method are automatically verified at the end of the test.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock'
+
+  class TestDog < Test::Unit::TestCase
+    include FlexMock::TestCase
+
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object
+received the message +wag+ exactly one time.  If it doesn't, the test
+will not pass.
+
+See the FlexMock documentation at
+http://onestepback.org/software/flexmock for details on specifying
+arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail
+objects directly.
+
+== Availability
+
+FlexMock is distributed with Rails, or you can make sure you have the
+latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at:
+http://onestepback.org/software/flexmock/
+
+-- Jim Weirich

data/lib/flexmock.rb

@@ -971,7 +971,6 @@ class FlexMock
     def initialize(obj, mock)
       @obj = obj
       @mock = mock
-      @methods_to_restore = []
       @method_definitions = {}
       @methods_proxied = []
     end
@@ -980,9 +979,6 @@ class FlexMock
     # mock object handle should_receive.
     def should_receive(method_name)
       method_name = method_name.to_sym
-      if @obj.methods.include?(method_name.to_s)
-        @methods_to_restore << method_name
-      end
       unless @methods_proxied.include?(method_name)
         hide_existing_method(method_name)
         @methods_proxied << method_name
@@ -999,9 +995,9 @@ class FlexMock
     # Remove all traces of the mocking framework from the existing object.
     def mock_teardown
       if ! detached?
-        @methods_to_restore.each do |method_name|
+        @methods_proxied.each do |method_name|
           remove_current_method(method_name)
-          restore_original_definition(method_name) if @method_definitions[method_name]
+          restore_original_definition(method_name)
         end
         @obj.instance_variable_set("@flexmock_proxy", nil)
         @obj = nil
@@ -1060,7 +1056,7 @@ class FlexMock
     # Remove the current method if it is a singleton method of the
     # object being mocked.
     def remove_current_method(method_name)
-      sclass.class_eval { remove_method(method_name)  }
+      sclass.class_eval { remove_method(method_name) }
     end
 
     # Have we been detached from the existing object?

data/test/test_stubbing.rb

@@ -58,7 +58,6 @@ class TestStubbing < Test::Unit::TestCase
     stub_proxy.mock_teardown
     assert_equal :woof, dog.bark
     assert_equal nil, dog.instance_variable_get("@flexmock_proxy")
-    assert ! dog.methods.include?("flexmock_old_bark")
   end
   
   def test_original_missing_behavior_can_be_restored
@@ -119,6 +118,14 @@ class TestStubbing < Test::Unit::TestCase
     assert_equal "hello3", obj.hi(3)
   end
 
+  def test_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubs
+    flexstub(File).should_receive(:open).with("foo").once.and_return(:ok)
+    flexstub(File).should_receive(:open).with("bar").once.and_return(:ok)
+
+    assert_equal :ok, File.open("foo")
+    assert_equal :ok, File.open("bar")
+  end
+
   def test_original_behavior_is_restored_even_when_errors
     flexstub(Dog).should_receive(:create).once.and_return(:mock)
     flexmock_teardown rescue nil

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0.6
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 date: 2006-10-18 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
@@ -46,6 +46,8 @@ files:
 - install.rb
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
+- doc/releases/flexmock-0.4.2.rdoc
+- doc/releases/flexmock-0.4.3.rdoc
 test_files: []
 
 rdoc_options: 
@@ -59,6 +61,8 @@ extra_rdoc_files:
 - CHANGELOG
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
+- doc/releases/flexmock-0.4.2.rdoc
+- doc/releases/flexmock-0.4.3.rdoc
 executables: []
 
 extensions: []