Fix #851: Do not attempt to re-stub constructors

sinonjs · Sep 26, 2015 · bdb973f · bdb973f
1 parent 775af99
commit bdb973f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/lib/sinon/stub.js b/lib/sinon/stub.js
@@ -54,6 +54,7 @@
                     // is not Object.prototype
                     if (
                         propOwner !== Object.prototype &&
+                        prop !== "constructor" &&
                         typeof sinon.getPropertyDescriptor(propOwner, prop).value === "function"
                     ) {
                         stub(object, prop);

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -101,6 +101,30 @@
                 clock = sinon.useFakeTimers(new Date("2015-1-5").getTime());
                 assert.equals(clock.now, Date.now());
             }
+        },
+
+        "#852 - createStubInstance on intherited constructors": {
+            "must not throw error": function () {
+                var A = function () {};
+                var B = function () {};
+
+                B.prototype = Object.create(A.prototype);
+                B.prototype.constructor = A;
+
+                refute.exception(function () {
+                    sinon.createStubInstance(B);
+                });
+            }
+        },
+
+        "#852(2) - createStubInstance should on same constructor": {
+            "must be idempotent": function () {
+                var A = function () {};
+                refute.exception(function () {
+                    sinon.createStubInstance(A);
+                    sinon.createStubInstance(A);
+                });
+            }
         }
     });
 }(this));