Make a helper method for extracting an array of spies.

unexpectedjs · Aug 5, 2016 · 05fa5d6 · 05fa5d6
1 parent 15af263
commit 05fa5d6
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/lib/unexpected-sinon.js b/lib/unexpected-sinon.js
@@ -418,13 +418,16 @@
                 }
             });
 
-            expect.addAssertion('<spy|array|sinonSandbox> to have calls [exhaustively] satisfying <function>', function (expect, subject, value) {
-                var spies = subject;
-                if (expect.subjectType.is('sinonSandbox')) {
-                    spies = subject.fakes;
-                } else if (!Array.isArray(spies)) {
-                    spies = [ spies ];
+            function extractSpies(spyOrArrayOrSinonSandbox) {
+                if (expect.findTypeOf(spyOrArrayOrSinonSandbox).is('sinonSandbox')) {
+                    return spyOrArrayOrSinonSandbox.fakes;
+                } else {
+                    return Array.isArray(spyOrArrayOrSinonSandbox) ? spyOrArrayOrSinonSandbox : [ spyOrArrayOrSinonSandbox ];
                 }
+            }
+
+            expect.addAssertion('<spy|array|sinonSandbox> to have calls [exhaustively] satisfying <function>', function (expect, subject, value) {
+                var spies = extractSpies(subject);
                 var expectedSpyCallSpecs = recordSpyCalls(spies, value);
                 var expectedSpyCalls = [];
                 expectedSpyCallSpecs.forEach(function (expectedSpyCallSpec) {
@@ -439,12 +442,7 @@
             });
 
             expect.addAssertion('<spy|array|sinonSandbox> to have calls [exhaustively] satisfying <array|object>', function (expect, subject, value) {
-                var spies = subject;
-                if (expect.subjectType.is('sinonSandbox')) {
-                    spies = subject.fakes;
-                } else if (!Array.isArray(spies)) {
-                    spies = [ spies ];
-                }
+                var spies = extractSpies(subject);
                 var spyCalls = [];
                 var isSeenBySpyId = {};
                 spies.forEach(function (spy) {