Merge pull request #1738 from nfriedly/issue-1736

fatso83 · web-flow · commit cee81561f967 · 2018-03-28T11:09:27.000+02:00
Fix onCall(#) with chained behaviors
diff --git a/lib/sinon/behavior.js b/lib/sinon/behavior.js
@@ -101,7 +101,7 @@ function callCallback(behavior, args) {
 
 var proto = {
     create: function create(stub) {
-        var behavior = extend({}, proto);
+        var behavior = extend(stub.bind(), proto);
         delete behavior.create;
         delete behavior.addBehavior;
         delete behavior.createBehavior;
@@ -219,7 +219,7 @@ function createBehavior(behaviorMethod) {
 function addBehavior(stub, name, fn) {
     proto[name] = function () {
         fn.apply(this, [this].concat([].slice.call(arguments)));
-        return this.stub || this;
+        return this;
     };
 
     stub[name] = createBehavior(name);
diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -420,4 +420,42 @@ describe("issues", function () {
             refute.isTrue(spyProp.get.called);
         });
     });
+
+    describe("#1736 - onCall + yield + returns", function () {
+        it("should return the correct value without onCall", function () {
+            var stub = sinon.stub().yields("yield val").returns("return val");
+            var cb = sinon.spy();
+
+            var ret = stub(cb);
+
+            assert.equals(ret, "return val");
+            assert.equals(cb.args, [["yield val"]]);
+        });
+        it("should return the correct value with onCall", function () {
+            var stub = sinon.stub().onCall(0).yields("yield val").returns("return val");
+            var cb = sinon.spy();
+
+            var ret = stub(cb);
+
+            assert.equals(ret, "return val");
+            assert.equals(cb.args, [["yield val"]]);
+        });
+        it("should return the correct value with multiple onCalls", function () {
+            var stub = sinon.stub()
+                .onCall(0).yields("yield val").returns("return val")
+                .onCall(1).yields("second yield val").returns("second return val");
+            var cb = sinon.spy();
+            var cb2 = sinon.spy();
+
+            var ret = stub(cb);
+            var ret2 = stub(cb2);
+
+
+            assert.equals(ret, "return val");
+            assert.equals(cb.args, [["yield val"]]);
+
+            assert.equals(ret2, "second return val");
+            assert.equals(cb2.args, [["second yield val"]]);
+        });
+    });
 });
