Merge pull request #1184 from mroderick/fail-on-empty-property-descri…

…ptor Fail on empty property descriptor
sinonjs · Dec 17, 2016 · a34f567 · a34f567
2 parents 5bbc5d8 + 96b2b44
commit a34f567
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/lib/sinon/stub.js b/lib/sinon/stub.js
@@ -19,23 +19,27 @@ var functionToString = require("./util/core/function-to-string");
 var valueToString = require("./util/core/value-to-string");
 var wrapMethod = require("./util/core/wrap-method");
 
-function stub(object, property, func) {
-    if (!!func && typeof func !== "function" && typeof func !== "object") {
+function stub(object, property, funcOrDescriptor) {
+    if (!!funcOrDescriptor && typeof funcOrDescriptor !== "function" && typeof funcOrDescriptor !== "object") {
         throw new TypeError("Custom stub should be a function or a property descriptor");
     }
 
+    if (typeof funcOrDescriptor === "object" && objectKeys(funcOrDescriptor).length === 0) {
+        throw new TypeError("Expected property descriptor to have at least one key");
+    }
+
     if (property && !object) {
         var type = object === null ? "null" : "undefined";
         throw new Error("Trying to stub property '" + valueToString(property) + "' of " + type);
     }
 
     var wrapper;
 
-    if (func) {
-        if (typeof func === "function") {
-            wrapper = spy && spy.create ? spy.create(func) : func;
+    if (funcOrDescriptor) {
+        if (typeof funcOrDescriptor === "function") {
+            wrapper = spy && spy.create ? spy.create(funcOrDescriptor) : funcOrDescriptor;
         } else {
-            wrapper = func;
+            wrapper = funcOrDescriptor;
             if (spy && spy.create) {
                 var types = objectKeys(wrapper);
                 for (var i = 0; i < types.length; i++) {

diff --git a/test/stub-test.js b/test/stub-test.js
@@ -31,6 +31,22 @@ describe("stub", function () {
         assert.equals(error.message, "Trying to stub property 'prop' of null");
     });
 
+    it("fails if called with an empty property descriptor", function () {
+        var error;
+        var propertyKey = "ea762c6d-16ab-4ded-8bc2-3bc6f2de2925";
+        var object = {};
+
+        object[propertyKey] = "257b38d8-3c02-4353-82ab-b1b588be6990";
+
+        try {
+            createStub(object, propertyKey, {});
+        } catch (e) {
+            error = e;
+        }
+
+        assert.equals(error.message, "Expected property descriptor to have at least one key");
+    });
+
     it("throws a readable error if stubbing Symbol on null", function () {
         if (typeof Symbol === "function") {
             try {