Merge pull request #1533 from noisecapella/gs/fix_undefined

resolvesThis should override previous throws
sinonjs · Aug 16, 2017 · 4310343 · 4310343
2 parents 28bcedc + f87b512
commit 4310343
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/lib/sinon/default-behaviors.js b/lib/sinon/default-behaviors.js
@@ -200,6 +200,7 @@ module.exports = {
         fake.reject = false;
         fake.returnValueDefined = false;
         fake.exception = undefined;
+        fake.exceptionCreator = undefined;
         fake.fakeFn = undefined;
     },
 

diff --git a/test/stub-test.js b/test/stub-test.js
@@ -324,6 +324,24 @@ describe("stub", function () {
 
             assert.same(stub.resolvesThis(), stub);
         });
+
+        it("overrides throws behavior for error objects", function () {
+            var instance = {};
+            instance.stub = createStub.create().throws(new Error()).resolvesThis();
+
+            return instance.stub().then(function (actual) {
+                assert.same(actual, instance);
+            });
+        });
+
+        it("overrides throws behavior for dynamically created errors", function () {
+            var instance = {};
+            instance.stub = createStub.create().throws().resolvesThis();
+
+            return instance.stub().then(function (actual) {
+                assert.same(actual, instance);
+            });
+        });
     });
 
     describe(".returnsArg", function () {