Merge pull request #1484 from HugoMuller/issue-1474

propagates promiseLibrary to new stub behaviors
sinonjs · Jul 13, 2017 · 7512258 · 7512258
2 parents 9365d49 + d14d296
commit 7512258
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/lib/sinon/behavior.js b/lib/sinon/behavior.js
@@ -105,6 +105,10 @@ var proto = {
         delete behavior.createBehavior;
         behavior.stub = stub;
 
+        if (stub.defaultBehavior && stub.defaultBehavior.promiseLibrary) {
+            behavior.promiseLibrary = stub.defaultBehavior.promiseLibrary;
+        }
+
         return behavior;
     },
 

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -251,6 +251,37 @@ describe("issues", function () {
         });
     });
 
+    describe("#1474 - stub.onCall", function () {
+        it("should preserve promise library", function () {
+            var promiseLib = {
+                resolve: function (value) {
+                    var promise = Promise.resolve(value);
+                    promise.tap = function () {
+                        return "tap " + value;
+                    };
+
+                    return promise;
+                }
+            };
+            var stub = sinon.stub().usingPromise(promiseLib);
+
+            stub.resolves("resolved");
+            stub.onSecondCall().resolves("resolved again");
+
+            var first = stub();
+            var second = stub();
+
+            assert.isFunction(first.then);
+            assert.isFunction(first.tap);
+
+            assert.isFunction(second.then);
+            assert.isFunction(second.tap);
+
+            assert.equals(first.tap(), "tap resolved");
+            assert.equals(second.tap(), "tap resolved again");
+        });
+    });
+
     if (typeof window !== "undefined") {
         describe("#1456", function () {
             var sandbox;