Merge 26706c6 into 2abfed1

sinonjs · Dec 10, 2018 · ba8dcc4 · ba8dcc4
2 parents 2abfed1 + 26706c6
commit ba8dcc4
Show file tree

Hide file tree

Showing 25 changed files with 93 additions and 2,598 deletions.
diff --git a/lib/sinon.js b/lib/sinon.js
@@ -13,7 +13,7 @@ var stub = require("./sinon/stub");
 var apiMethods = {
     createSandbox: createSandbox,
     assert: require("./sinon/assert"),
-    match: require("./sinon/match"),
+    match: require("@sinonjs/samsam").createMatcher,
     spyCall: require("./sinon/call"),
 
     expectation: require("./sinon/mock-expectation"),

diff --git a/lib/sinon/assert.js b/lib/sinon/assert.js
@@ -2,10 +2,10 @@
 
 var arrayProto = require("@sinonjs/commons").prototypes.array;
 var calledInOrder = require("@sinonjs/commons").calledInOrder;
+var createMatcher = require("@sinonjs/samsam").createMatcher;
 var orderByFirstCall = require("@sinonjs/commons").orderByFirstCall;
 var timesInWords = require("./util/core/times-in-words");
 var format = require("./util/core/format");
-var sinonMatch = require("./match");
 var stringSlice = require("@sinonjs/commons").prototypes.string.slice;
 
 var arraySlice = arrayProto.slice;
@@ -170,7 +170,7 @@ assert = {
     },
 
     match: function match(actual, expectation) {
-        var matcher = sinonMatch(expectation);
+        var matcher = createMatcher(expectation);
         if (matcher.test(actual)) {
             assert.pass("match");
         } else {

diff --git a/lib/sinon/call.js b/lib/sinon/call.js
@@ -1,8 +1,8 @@
 "use strict";
 
 var arrayProto = require("@sinonjs/commons").prototypes.array;
-var sinonMatch = require("./match");
-var deepEqual = require("./util/core/deep-equal").use(sinonMatch);
+var match = require("@sinonjs/samsam").createMatcher;
+var deepEqual = require("@sinonjs/samsam").deepEqual;
 var functionName = require("@sinonjs/commons").functionName;
 var sinonFormat = require("./util/core/format");
 var valueToString = require("@sinonjs/commons").valueToString;
@@ -24,7 +24,7 @@ function throwYieldError(proxy, text, args) {
 
 var callProto = {
     calledOn: function calledOn(thisValue) {
-        if (sinonMatch && sinonMatch.isMatcher(thisValue)) {
+        if (match.isMatcher(thisValue)) {
             return thisValue.test(this.thisValue);
         }
         return this.thisValue === thisValue;
@@ -41,7 +41,7 @@ var callProto = {
         return reduce(
             calledWithArgs,
             function(prev, arg, i) {
-                return prev && deepEqual(arg, self.args[i]);
+                return prev && deepEqual(self.args[i], arg);
             },
             true
         );
@@ -60,7 +60,7 @@ var callProto = {
             function(prev, expectation, i) {
                 var actual = self.args[i];
 
-                return prev && (sinonMatch && sinonMatch(expectation).test(actual));
+                return prev && match(expectation).test(actual);
             },
             true
         );
@@ -79,7 +79,7 @@ var callProto = {
     },
 
     returned: function returned(value) {
-        return deepEqual(value, this.returnValue);
+        return deepEqual(this.returnValue, value);
     },
 
     threw: function threw(error) {