Merge pull request #1030 from mroderick/add-test-for-issue-1026

Add test for issue #1026
sinonjs · Dec 27, 2016 · 45900b8 · 45900b8
2 parents ba631c6 + 2f04613
commit 45900b8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/lib/sinon/walk.js b/lib/sinon/walk.js
@@ -21,7 +21,7 @@
             }
 
             Object.getOwnPropertyNames(obj).forEach(function (k) {
-                if (!seen[k]) {
+                if (seen[k] !== true) {
                     seen[k] = true;
                     var target = typeof Object.getOwnPropertyDescriptor(obj, k).get === "function" ?
                         originalObj : obj;

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -221,6 +221,38 @@
 
                 sandbox.restore();
             }
+        },
+
+        "#1026 - should stub watch method on any Object": function () {
+            // makes sure that Object.prototype.watch is set back to its old value
+            function restore(oldWatch) {
+                if (oldWatch) {
+                    Object.prototype.watch = oldWatch;  // eslint-disable-line no-extend-native
+                } else {
+                    delete Object.prototype.watch;
+                }
+            }
+
+            try {
+                var oldWatch = Object.prototype.watch;
+
+                if (typeof Object.prototype.watch !== "function") {
+                    Object.prototype.watch = function rolex() {}; // eslint-disable-line no-extend-native
+                }
+
+                var stubbedObject = sinon.stub({
+                    watch: function () {}
+                });
+
+                stubbedObject.watch();
+
+                assert.isArray(stubbedObject.watch.args);
+            } catch (error) {
+                restore(oldWatch);
+                throw error;
+            }
+
+            restore(oldWatch);
         }
     });
 }(this));
diff --git a/test/walk-test.js b/test/walk-test.js
@@ -132,7 +132,7 @@
                 assert(iterator.alwaysCalledOn(rcvr));
                 assert(iterator.calledWith("world", "hello"));
                 assert(iterator.calledWith(15, "foo"));
-            } catch(e) {
+            } catch (e) {
                 err = e;
             } finally {
                 Object.getOwnPropertyNames = getOwnPropertyNames;
@@ -143,15 +143,22 @@
 
         "does not walk the same property twice": function () {
             var parent = {
-                func: function () {}
+                func: function parentFunc() {}
             };
             var child = sinon.create(parent);
-            child.func = function () {};
+            child.func = function childFunc() {};
             var iterator = sinon.spy();
 
             sinon.walk(child, iterator);
 
-            assert.equals(iterator.callCount, 1);
+            var propertyNames = iterator.args.map(function (call) {
+                return call[1];
+            });
+
+            // make sure that each property name only exists once
+            propertyNames.forEach(function (name, index) {
+                assert.equals(index, propertyNames.lastIndexOf(name));
+            });
         }
     });
 }(this));