Merge 5204f46 into 67b8c0c

sinonjs · Jul 19, 2019 · 63bbe69 · 63bbe69
2 parents 67b8c0c + 5204f46
commit 63bbe69
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 0 deletions.
diff --git a/lib/sinon/behavior.js b/lib/sinon/behavior.js
@@ -135,6 +135,7 @@ var proto = {
         );
     },
 
+    /*eslint complexity: ["error", 20]*/
     invoke: function invoke(context, args) {
         /*
          * callCallback (conditionally) calls ensureArgs
@@ -171,7 +172,11 @@ var proto = {
             return (this.promiseLibrary || Promise).reject(this.returnValue);
         } else if (this.callsThrough) {
             var wrappedMethod = this.effectiveWrappedMethod();
+
             return wrappedMethod.apply(context, args);
+        } else if (this.callsThroughWithNew) {
+            var WrappedClass = this.effectiveWrappedMethod();
+            return new WrappedClass(args);
         } else if (typeof this.returnValue !== "undefined") {
             return this.returnValue;
         } else if (typeof this.callArgAt === "number") {

diff --git a/lib/sinon/default-behaviors.js b/lib/sinon/default-behaviors.js
@@ -221,6 +221,10 @@ var defaultBehaviors = {
         fake.callsThrough = true;
     },
 
+    callThroughWithNew: function callThroughWithNew(fake) {
+        fake.callsThroughWithNew = true;
+    },
+
     get: function get(fake, getterFunction) {
         var rootStub = fake.stub || fake;
 

diff --git a/test/stub-test.js b/test/stub-test.js
@@ -3136,6 +3136,73 @@ describe("stub", function() {
         });
     });
 
+    describe(".callThroughWithNew", function() {
+        it("does not call original function with new when arguments match conditional stub", function() {
+            // We need a function here because we can't wrap properties that are already stubs
+            var callCount = 0;
+            var OriginalClass = function SomeClass() {
+                this.foo = "bar";
+                callCount++;
+            };
+
+            var myObj = {
+                MyClass: OriginalClass
+            };
+
+            var propStub = createStub(myObj, "MyClass");
+            propStub.withArgs("foo").returns({ foo: "bar" });
+            propStub.callThroughWithNew(propStub);
+
+            var result = new myObj.MyClass("foo");
+
+            assert.equals(result.foo, "bar");
+            assert.equals(callCount, 0);
+        });
+
+        it("calls original function with new when arguments do not match conditional stub", function() {
+            var callCount = 0;
+            function OriginalClass() {
+                this.foo = "baz";
+                callCount++;
+            }
+
+            var myObj = {
+                MyClass: OriginalClass
+            };
+
+            var propStub = createStub(myObj, "MyClass");
+            propStub.withArgs("foo").returns({ foo: "bar" });
+            propStub.callThroughWithNew(propStub);
+
+            var result = new myObj.MyClass("not foo");
+            assert.equals(result.foo, "baz");
+            assert.equals(callCount, 1);
+        });
+
+        it("calls original function with new with same arguments when call does not match conditional stub", function() {
+            // We need a function here because we can't wrap properties that are already stubs
+            var callArgs = [];
+
+            function OriginalClass() {
+                callArgs = arguments;
+                this.foo = "baz";
+            }
+
+            var myObj = {
+                MyClass: OriginalClass
+            };
+
+            var propStub = createStub(myObj, "MyClass");
+            propStub.withArgs("foo").returns({ foo: "bar" });
+            propStub.callThroughWithNew(propStub);
+
+            var result = new myObj.MyClass("not foo");
+            assert.equals(callArgs[0].length, 1);
+            assert.equals(callArgs[0][0], "not foo");
+            assert.equals(result.foo, "baz");
+        });
+    });
+
     describe(".get", function() {
         it("allows users to stub getter functions for properties", function() {
             var myObj = {