lib/caricature/clr/messenger.rb in caricature-0.7.0 vs lib/caricature/clr/messenger.rb in caricature-0.7.1

@@ -5,17 +5,19 @@
 
     protected
     
       # deliver the message to the receiving isolation
       def internal_deliver(mode, method_name, return_type, *args, &b)   
-        exp = expectations.find(method_name, mode, *args) 
+        exp = expectations.find(method_name, mode, *args)
+        bl = record_call(method_name, mode, exp, *args, &b)
         is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type 
         res = nil
         if exp
-          res = instance.__send__(method_name, *args, &b) if exp.super_before?
-          res = exp.execute *args
-          res = instance.__send__(method_name, *args, &b) if !exp.super_before? and exp.call_super?
+          block = exp.block || b
+          res = instance.__send__(method_name, *args, &block) if exp.super_before?
+          res = exp.execute *args, &bl
+          res = instance.__send__(method_name, *args, &block) if !exp.super_before? and exp.call_super?
         end
         res ||= System::Activator.create_instance(return_type) if is_value_type     
         res
       end
 
@@ -29,10 +31,11 @@
       # deliver the message to the receiving isolation
       def internal_deliver(mode, method_name, return_type, *args, &b)    
         res = nil                                               
         is_value_type = return_type && return_type != System::Void.to_clr_type && return_type.is_value_type
         exp = expectations.find(method_name, mode, *args)
-        res = exp.execute *args if exp
+        bl = record_call(method_name, mode, exp, *args, &b)
+        res = exp.execute *args, &bl if exp
         res ||= System::Activator.create_instance(return_type) if is_value_type  
         res
       end
 
   end
\ No newline at end of file