facon 0.4.0 → 0.4.1

data/Changelog.txt

@@ -0,0 +1,15 @@
+=== 0.4.1 / 2008-12-05
+
+* Added #times, #once and #never expectation matchers. Thanks raggi!
+  E.g. 
+    @mock.should.receive(:call_me_thrice).times(3)
+    @mock.should.receive(:just_this_1_time).once
+    @mock.should.receive(:dont_even_think_about_it).never
+
+=== 0.4.0 / 2008-12-05
+
+* Fix compatibility with Bacon 1.0 and 1.1.
+
+=== 0.3.1 / 2008-02-19
+
+* Fixed a bug where mocks were not being teared down when there is a previous spec failure.

data/Manifest.txt

@@ -1,3 +1,4 @@
+Changelog.txt
 History.txt
 Manifest.txt
 README.txt

data/README.txt

@@ -73,6 +73,10 @@ You can get the latest trunk from the Git repository on Github:
 * Throw away unnecessary code.
 * Implement exactly, at_least, at_most expectations.
 
+== Contributors
+
+* raggi (http://blog.ra66i.org/) for #times, #once, #never expectation matchers.
+
 == Thanks to
 
 * RSpec (http://rspec.info/) for creating spec/mocks, from which a lot of the code for Facon is stolen.

data/lib/facon.rb

@@ -12,5 +12,5 @@ require 'facon/core_ext/object'
 # Facon is a mocking library in the spirit of the Bacon spec library. Small,
 # compact, and works with Bacon.
 module Facon
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/facon/expectation.rb

@@ -67,7 +67,7 @@ module Facon
           nil
         end
 
-        if @return_block
+        if defined?(@return_block) && @return_block
           args << block unless block.nil?
           @return_block.call(*args)
         else
@@ -103,6 +103,15 @@ module Facon
       false
     end
 
+    def times(val)
+      @expected_received_count = val
+      self
+    end
+
+    def once; times(1); end
+
+    def never; times(0); end
+
     private
       def check_arguments(args)
         case @argument_expectation

data/lib/facon/proxy.rb

@@ -12,6 +12,7 @@ module Facon
       @stubs = []
       @proxied_methods = []
       @error_generator = ErrorGenerator.new(target, name)
+      @expectation_ordering = nil unless defined?(@expectation_ordering)
     end
 
     def add_stub(expected_from, method)

data/spec/expectation_spec.rb

@@ -31,7 +31,7 @@ describe "A mock object" do
     @mock.should_not_receive(:not_expected)
     @mock.not_expected
 
-    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it 1 time" 
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it 1 time"
   end
 
   it "should raise a MockExpectationError when receiving message specified as not to be received with arguments" do
@@ -114,11 +114,72 @@ describe "A mock object" do
       end.and_return(:that)
     }.should.raise(Facon::MockExpectationError).message.should == 'Ambiguous return expectation'
   end
-end
 
+  it "should pass when receiving a message the expected number of times" do
+    @mock.should_receive(:message).times(3)
 
+    3.times do
+      @mock.message
+    end
+
+    verify_mock
+  end
+
+  it "should raise a MockExpectationError when receiving a message < expected number of times" do
+    @mock.should_receive(:message).times(3)
+
+    1.times do
+      @mock.message
+    end
+
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :message with (any args) 3 times, but received it 1 time"
+  end
+
+  it "should raise a MockExpectationError when receiving a message > expected number of times" do
+    @mock.should_receive(:message).times(3)
+
+    5.times do
+      @mock.message
+    end
+
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :message with (any args) 3 times, but received it 5 times"
+  end
+
+  it "should pass when receiving a message once as expected" do
+    @mock.should.receive(:message).once
 
+    @mock.message
 
+    verify_mock
+  end
+
+  it "should raise a MockExpectationError when never receiving a message but expecting it once" do
+    @mock.should.receive(:message).once
+
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :message with (any args) 1 time, but received it 0 times"
+  end
+
+  it "should raise a MockExpectationError when receiving a message more than once but expecting it once" do
+    @mock.should.receive(:message).once
 
+    2.times do
+      @mock.message
+    end
 
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :message with (any args) 1 time, but received it 2 times"
+  end
 
+  it "should pass when never receiving a message as expected" do
+    @mock.should.receive(:message).never
+
+    verify_mock
+  end
+
+  it "should raise a MockExpectationError when receiving a message but never expecting it" do
+    @mock.should.receive(:message).never
+
+    @mock.message
+
+    lambda { @mock.spec_verify }.should.raise(Facon::MockExpectationError).message.should == "Mock 'test mock' expected :message with (any args) 0 times, but received it 1 time"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facon
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Cheah Chu Yeow
@@ -29,10 +29,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- Changelog.txt
 - History.txt
 - Manifest.txt
 - README.txt
 files: 
+- Changelog.txt
 - History.txt
 - Manifest.txt
 - README.txt