expectations 1.1.0 → 1.2.0

data/lib/expectations/delegate_recorder.rb

@@ -2,9 +2,7 @@ module Expectations::DelegateRecorder
   attr_accessor :delegation_result
   
   def delegate!(meth)
-    @subject_mock = Mocha::Mock.new
     @meth = meth
-    @subject_mock.expects(meth).returns(:a_delegated_return_value)
     recorder = self
     mod = Module.new do
       define_method meth do |*args|
@@ -20,21 +18,22 @@ module Expectations::DelegateRecorder
   end
   
   def subject!
+    @subject_mock = Object.new
+    @subject_mock.expects(@meth).returns(:a_delegated_return_value)
     subject.stubs(@receiver).returns(@subject_mock)
     subject
   end
   
   def verify
-    @subject_mock.verify
     :a_delegated_return_value == delegation_result
   end
   
   def failure_message
-    "expected #{subject}.#{@meth} to return the value of #{subject}.#{@receiver}.#{@meth}; however, #{subject}.#{@meth} returned #{delegation_result}"
+    "expected #{subject}.#{@meth} to return the value of #{subject}.#{@receiver}.#{@meth}; however, #{subject}.#{@meth} returned #{delegation_result.inspect}"
   end
   
   def mocha_error_message(ex)
-    "expected #{subject} to delegate #{@meth} to #{@receiver}; however, #{subject}.#{@meth} was never called"
+    "expected #{subject} to delegate #{@meth} to #{@receiver}; however, #{subject}.#{@meth} was never called -- #{ex}"
   end
   
 end

data/lib/expectations/mock_recorder.rb

@@ -20,6 +20,10 @@ module Expectations::MockRecorder
     subject
   end
   
+  def verify
+    true
+  end
+
   def mocha_error_message(ex)
     ex.message
   end

data/lib/expectations/recorded_expectation.rb

@@ -6,7 +6,7 @@ module Expectations::RecordedExpectation
       warn_for_expects do
         instance_exec(expected.subject, &block) if block
       end
-      if mocha_verify
+      if expected.verify! && mocha_verify
         self.extend(Expectations::Results::Fulfilled)
       else
         self.extend(Expectations::Results::StateBasedFailure)

data/rakefile.rb

@@ -46,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 +01:00
+date: 2008-07-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency