Merge pull request #1500 from cypress-io/issues/#1487

Fix #1487: Reduced test case
sinonjs · Jul 28, 2017 · 0d099aa · 0d099aa
2 parents cbf1128 + b7ce6dd
commit 0d099aa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/sinon/spy.js b/lib/sinon/spy.js
@@ -220,6 +220,9 @@ var spyApi = {
 
         // Make return value and exception available in the calls:
         createCallProperties.call(this);
+        matchings.forEach(function (matching) {
+            createCallProperties.call(matching);
+        });
 
         if (exception !== undefined) {
             throw exception;

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -2,6 +2,7 @@
 
 var referee = require("referee");
 var sinon = require("../../lib/sinon");
+var createStub = require("../../lib/sinon/stub");
 var assert = referee.assert;
 var refute = referee.refute;
 
@@ -298,4 +299,20 @@ describe("issues", function () {
             assert.equals(window.innerHeight, 111);
         });
     });
+
+    describe("#1487 - withArgs() returnValue", function () {
+        beforeEach(function () {
+            this.stub = createStub().throws("Nothing set");
+            this.stub.withArgs("arg").returns("return value");
+            this.stub("arg");
+        });
+
+        it("sets correct firstCall.returnValue", function () {
+            assert.equals(this.stub.withArgs("arg").firstCall.returnValue, "return value");
+        });
+
+        it("sets correct lastCall.returnValue", function () {
+            assert.equals(this.stub.withArgs("arg").lastCall.returnValue, "return value");
+        });
+    });
 });