flexmock 0.7.1 → 0.8.0

data/CHANGES

@@ -1,9 +1,25 @@
 = Changes for FlexMock
 
-== Pre-Version 0.7.1
+== Version 0.8.0
+
+* Added by_default
+* Added undefined behavior
+* Mock methods are added to partial mocks only if they are not
+  previously defined.  This should reduce the need for safe mode.
+* respond_to? on mocks now accepts multiple arguments.  This eases
+  mocking in rails a little bit.
+* Added experimental view mocking for rails.
+
+== Version 0.7.2
+
+* Changed initial model Id to 10000.
+* Added test suggested for RSpec Mocks, just to make sure we were good too.
+
+== Version 0.7.1
 
 * Updated install.rb to handle non-root destination directories via
   DESTDIR.
+* Fixed operator bug introduced in 0.7.0. 
 
 == Version 0.7.0
 

data/README

@@ -1,9 +1,9 @@
-= Flex Mock -- Making Mock Easy
+examples= Flex Mock -- Making Mock Easy
 
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.7.1
+Version :: 0.8.0
 
 = Links
 
@@ -67,7 +67,7 @@ Your test case will look something like this:
 
   require 'flexmock/test_unit'
 
-  class TestDog < Test::Case::TestCase
+  class TestDog < Test::Unit::TestCase
     def test_dog_wags
       tail_mock = flexmock(:wag => :happy)
       assert_equal :happy, tail_mock.wag
@@ -405,6 +405,17 @@ object. See theFlexMock::Expectation for more details.
   the per-mock ordering are available in the globally ordered method
   calls.
 
+* <b>by_default</b>
+
+  Marks the expectation as a default.  Default expectations act as
+  normal as long as there are no non-default expectations for the same
+  method name.  As soon as a non-default expectation is defined, all
+  default expectations for that method name are ignored.
+
+  Default expectations allow you to setup a set of default behaviors
+  for various methods in the setup of a test suite, and then override
+  only the methods that need special handling in any given test.
+
 * <b>mock</b>
 
   Expectation constraints always return the expectation so that the
@@ -486,6 +497,19 @@ The following rules are used for argument matching:
 
   will match any even integer.
 
+* If you wish to match a method call where a block is given, add
+  <tt>Proc</tt> as the last argument to <tt>with</tt>.
+
+  Example:
+
+      m.should_receive(:foo).with(Integer,Proc).and_return(:got_block)
+      m.should_receive(:foo).with(Integer).and_return(:no_block)
+
+  will cause the mock to return the following:
+
+     m.foo(1) { } => returns :got_block
+     m.foo(1)     => returns :no_block
+
 === Creating Partial Mocks
 
 Sometimes it is useful to mock the behavior of one or two methods in an
@@ -526,11 +550,11 @@ Here's the test code:
     # Woofer and return a mock woofer.
     def setup
       @dog = Dog.new
-      flexmock(dog, :bark => :grrr)
+      flexmock(@dog, :bark => :grrr)
     end
 
     def test_dog
-      assert_equal :grrrr, @dog.bark   # Mocked Method
+      assert_equal :grrr, @dog.bark   # Mocked Method
       assert_equal :happy, @dog.wag    # Normal Method
     end
   end
@@ -612,6 +636,40 @@ methods at the same time. E.g.
         m.should_receive(:wag).at_least.once.and_return(:happy)
       end
 
+=== Default Expectations on Mocks
+
+Sometimes you want to setup a bunch of default expectations that are
+pretty much for a number of different tests.  Then in the individual
+tests, you would like to override the default behavior on just that
+one method you are testing at the moment.  You can do that by using
+the <tt>by_default</tt> modifier.
+
+In your test setup you might have:
+
+  def setup
+    @mock_dog = flexmock("Fido")
+    @mock_dog.should_receive(:tail => :a_tail, :bark => "woof").by_default
+  end
+    
+The behaviors for :tail and :bark are good for most of the tests, but
+perhaps you wish to verify that :bark is called exactly once in a
+given test.  Since :bark by default has no count expectations, you can
+override the default in the given test.
+
+  def test_something_where_bark_must_be_called_once
+    @mock_dog.should_receive(:bark => "woof").once
+
+    # At this point, the default for :bark is ignored, 
+    # and the "woof" value will be returned.
+
+    # However, the default for :tail (which returns :a_tail)
+    # is still active.
+  end 
+
+By setting defaults, your individual tests don't have to concern
+themselves with details of all the default setup.  But the details of
+the overrides are right there in the body of the test.
+
 === Mocking Law of Demeter Violations
 
 The Law of Demeter says that you should only invoke methods on objects
@@ -684,6 +742,19 @@ beforehand.
      end
    end
 
+=== Create a mock object that returns an undefined object for method calls
+
+   require 'flexmock/test_unit'
+   
+   class TestUndefined < Test::Unit::TestCase
+     def test_undefined_values
+       m = flexmock("mock")
+       m.should_receive(:divide_by).with(0).
+         and_return_undefined
+       assert_equal FlexMock.undefined, m.divide_by(0)
+     end
+   end
+
 === Expect multiple queries and a single update
 
 Multiple calls to the query method will be allows, and calls may have any
@@ -753,8 +824,8 @@ specified indirectly using a symbol.
        rec.startup.once.ordered
        rec.query("CPWR") { 12.3 }.once.ordered(:queries)
        rec.query("MSFT") { 10.0 }.once.ordered(:queries)
-       rec.query("^....$/) { 3.3 }.at_least.once.ordered(:queries)
-       rec.finish)once.ordered
+       rec.query(/^....$/) { 3.3 }.at_least.once.ordered(:queries)
+       rec.finish.once.ordered
      end
      # test code here using +db+.
    end
@@ -808,12 +879,15 @@ ignoring.
      # test code here
    end
 
-<b>Note:</b> The original +mock_ignore_missing+ is now an alias for
-+should_ignore_missing+.
+When +should_ignore_missing+ is enabled, ignored missing methods will
+return an undefined object.  Any operation on the undefined object
+will return the undefined object.
 
 === Mock just one method on an existing object
 
-The Portfolio class calculate the value of a set of stocks by talking to a quote service via a web service.  Since we don't want to use a real web service in our unit tests, we will mock the quote service.
+The Portfolio class calculate the value of a set of stocks by talking
+to a quote service via a web service.  Since we don't want to use a
+real web service in our unit tests, we will mock the quote service.
 
   def test_portfolio_value
     flexmock(QuoteService).new_instances do |m|

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.7.1'
+PKG_VERSION = '0.8.0'
 
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -200,15 +200,15 @@ end
 
 # Tagging ------------------------------------------------------------
 
-module Tags
-  RUBY_FILES = FileList['**/*.rb'].exclude("pkg")
-end
+# module Tags
+#   RUBY_FILES = FileList['**/*.rb'].exclude("pkg")
+# end
 
-namespace "tags" do
-  task :emacs => Tags::RUBY_FILES do
-    puts "Making Emacs TAGS file"
-    sh "xctags -e #{Tags::RUBY_FILES}", :verbose => false
-  end
-end
+# namespace "tags" do
+#   task :emacs => Tags::RUBY_FILES do
+#     puts "Making Emacs TAGS file"
+#     sh "xctags -e #{Tags::RUBY_FILES}", :verbose => false
+#   end
+# end
 
-task :tags => ["tags:emacs"]
+# task :tags => ["tags:emacs"]