treat procs as if they were blocks to and_return

Author: askreet

lib/rspec/mocks/message_expectation.rb

@@ -732,12 +732,14 @@ def initialize(procs_to_invoke)
         @procs_to_invoke = procs_to_invoke
       end
 
-      def call(*_args_to_ignore, &_block)
-        if @procs_to_invoke.size > 1
-          @procs_to_invoke.shift.call
-        else
-          @procs_to_invoke.first.call
-        end
+      def call(*args, &block)
+        proc = if @procs_to_invoke.size > 1
+                 @procs_to_invoke.shift
+               else
+                 @procs_to_invoke.first
+               end
+
+        proc.call(*args, &block)
       end
     end
 

spec/rspec/mocks/and_invoke_spec.rb

@@ -28,6 +28,18 @@ module Mocks
             .to raise_error(ArgumentError, "Arguments to `and_invoke` must be callable.")
         end
       end
+
+      context 'when calling passed callables' do
+        let(:dbl) { double }
+
+        it 'passes the arguments into the callable' do
+          expect(dbl).to receive(:square_then_cube).and_invoke(lambda { |i| i ** 2 },
+                                                               lambda { |i| i ** 3 })
+
+          expect(dbl.square_then_cube(2)).to eq 4
+          expect(dbl.square_then_cube(2)).to eq 8
+        end
+      end
     end
   end
 end