Move "fakes" property from proxy to spy and stub

Implement a base `matchingFakes` function and move the actual implementation into `spy.js`.
sinonjs · Oct 19, 2019 · cd4f6d0 · cd4f6d0
1 parent 30bf0e9
commit cd4f6d0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/lib/sinon/proxy.js b/lib/sinon/proxy.js
@@ -10,7 +10,8 @@ var proxyInvoke = require("./proxy-invoke");
 var push = arrayProto.push;
 var forEach = arrayProto.forEach;
 var slice = arrayProto.slice;
-var filter = Array.prototype.filter;
+
+var emptyFakes = Object.freeze([]);
 
 // Public API
 var proxyApi = {
@@ -30,10 +31,12 @@ var proxyApi = {
 
     invoke: proxyInvoke,
 
-    matchingFakes: function(args, strict) {
-        return filter.call(this.fakes, function(fake) {
-            return fake.matches(args, strict);
-        });
+    /*
+     * Hook for derived implementation to return fake instances matching the
+     * given arguments.
+     */
+    matchingFakes: function(/*args, strict*/) {
+        return emptyFakes;
     },
 
     getCall: function getCall(i) {
@@ -127,9 +130,11 @@ var proxyApi = {
         this.callIds = [];
         this.errorsWithCallStack = [];
 
-        forEach(this.fakes, function(fake) {
-            fake.resetHistory();
-        });
+        if (this.fakes) {
+            forEach(this.fakes, function(fake) {
+                fake.resetHistory();
+            });
+        }
 
         return this;
     }
@@ -276,8 +281,7 @@ function wrapFunction(func, originalFunc) {
         thisValues: [],
         exceptions: [],
         callIds: [],
-        errorsWithCallStack: [],
-        fakes: []
+        errorsWithCallStack: []
     });
     return p;
 }

diff --git a/lib/sinon/spy.js b/lib/sinon/spy.js
@@ -18,6 +18,7 @@ var forEach = arrayProto.forEach;
 var pop = arrayProto.pop;
 var push = arrayProto.push;
 var slice = arrayProto.slice;
+var filter = Array.prototype.filter;
 
 var uuid = 0;
 
@@ -60,6 +61,13 @@ var spyApi = {
         return fake;
     },
 
+    // Override proxy default implementation
+    matchingFakes: function(args, strict) {
+        return filter.call(this.fakes, function(fake) {
+            return fake.matches(args, strict);
+        });
+    },
+
     matches: function(args, strict) {
         var margs = this.matchingArguments;
 
@@ -140,6 +148,7 @@ function createSpy(func) {
     extend.nonEnum(proxy, spyApi);
     extend.nonEnum(proxy, {
         displayName: name || "spy",
+        fakes: [],
         instantiateFake: createSpy,
         id: "spy#" + uuid++
     });

diff --git a/lib/sinon/stub.js b/lib/sinon/stub.js
@@ -47,6 +47,7 @@ function createStub(originalFunc) {
 
     var name = originalFunc ? functionName(originalFunc) : null;
     extend.nonEnum(proxy, {
+        fakes: [],
         instantiateFake: createStub,
         displayName: name || "stub",
         defaultBehavior: null,