Merge 545c39c into 200aa48

lib/deep-equal.js

@@ -1,6 +1,9 @@
 "use strict";
 
 var valueToString = require("@sinonjs/commons").valueToString;
+var className = require("@sinonjs/commons").className;
+var arrayProto = require("@sinonjs/commons").prototypes.array;
+var objectProto = require("@sinonjs/commons").prototypes.object;
 
 var getClass = require("./get-class");
 var identical = require("./identical");
@@ -12,12 +15,11 @@ var isNaN = require("./is-nan");
 var isObject = require("./is-object");
 var isSet = require("./is-set");
 var isSubset = require("./is-subset");
-var getClassName = require("./get-class-name");
 
-var every = Array.prototype.every;
+var every = arrayProto.every;
 var getTime = Date.prototype.getTime;
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-var indexOf = Array.prototype.indexOf;
+var hasOwnProperty = objectProto.hasOwnProperty;
+var indexOf = arrayProto.indexOf;
 var keys = Object.keys;
 var getOwnPropertySymbols = Object.getOwnPropertySymbols;
 
@@ -114,8 +116,8 @@ function deepEqualCyclic(actual, expectation, match) {
         var expectationClass = getClass(expectationObj);
         var actualKeys = keys(actualObj);
         var expectationKeys = keys(expectationObj);
-        var actualName = getClassName(actualObj);
-        var expectationName = getClassName(expectationObj);
+        var actualName = className(actualObj);
+        var expectationName = className(expectationObj);
         var expectationSymbols =
             typeof getOwnPropertySymbols === "function"
                 ? getOwnPropertySymbols(expectationObj)
@@ -172,8 +174,8 @@ function deepEqualCyclic(actual, expectation, match) {
             return mapsDeeplyEqual;
         }
 
-        return every.call(expectationKeysAndSymbols, function(key) {
-            if (!hasOwnProperty.call(actualObj, key)) {
+        return every(expectationKeysAndSymbols, function(key) {
+            if (!hasOwnProperty(actualObj, key)) {
                 return false;
             }
 
@@ -185,10 +187,10 @@ function deepEqualCyclic(actual, expectation, match) {
             // (it's faster to check for isObject first, than to
             // get -1 from getIndex for non objects)
             var actualIndex = actualObject
-                ? indexOf.call(actualObjects, actualValue)
+                ? indexOf(actualObjects, actualValue)
                 : -1;
             var expectationIndex = expectationObject
-                ? indexOf.call(expectationObjects, expectationValue)
+                ? indexOf(expectationObjects, expectationValue)
                 : -1;
             // determines the new paths of the objects
             // - for non cyclic objects the current path will be extended

lib/get-class.js

@@ -1,12 +1,12 @@
 "use strict";
 
-var o = Object.prototype;
+var toString = require("@sinonjs/commons").prototypes.object.toString;
 
 function getClass(value) {
     // Returns the internal [[Class]] by calling Object.prototype.toString
     // with the provided value as this. Return value is a string, naming the
     // internal class, e.g. "Array"
-    return o.toString.call(value).split(/[ \]]/)[1];
+    return toString(value).split(/[ \]]/)[1];
 }
 
 module.exports = getClass;

lib/matcher.js

@@ -19,9 +19,20 @@ var some = arrayProto.some;
 
 var hasOwnProperty = objectProto.hasOwnProperty;
 var isPrototypeOf = objectProto.isPrototypeOf;
+var objectToString = objectProto.toString;
 
 var stringIndexOf = stringProto.indexOf;
 
+var matcher = {
+    toString: function() {
+        return this.message;
+    }
+};
+
+function isMatcher(object) {
+    return isPrototypeOf(matcher, object);
+}
+
 function assertType(value, type, name) {
     var actual = typeOf(value);
     if (actual !== type) {
@@ -44,14 +55,14 @@ function assertMethodExists(value, method, name, methodPath) {
     }
 }
 
-var matcher = {
-    toString: function() {
-        return this.message;
+function assertMatcher(value) {
+    if (!isMatcher(value)) {
+        throw new TypeError("Matcher expected");
     }
-};
+}
 
-function isMatcher(object) {
-    return isPrototypeOf(matcher, object);
+function isIterable(value) {
+    return !!value && typeOf(value.forEach) === "function";
 }
 
 function matchObject(actual, expectation) {
@@ -246,9 +257,7 @@ match.instanceOf = function(type) {
     }
     return match(function(actual) {
         return actual instanceof type;
-    }, "instanceOf(" +
-        (functionName(type) || Object.prototype.toString.call(type)) +
-        ")");
+    }, "instanceOf(" + (functionName(type) || objectToString(type)) + ")");
 };
 
 function createPropertyMatcher(propertyTest, messagePrefix) {
@@ -305,9 +314,7 @@ match.hasNested = function(property, value) {
 };
 
 match.every = function(predicate) {
-    if (!isMatcher(predicate)) {
-        throw new TypeError("Matcher expected");
-    }
+    assertMatcher(predicate);
 
     return match(function(actual) {
         if (typeOf(actual) === "object") {
@@ -317,8 +324,7 @@ match.every = function(predicate) {
         }
 
         return (
-            !!actual &&
-            typeOf(actual.forEach) === "function" &&
+            isIterable(actual) &&
             every(actual, function(element) {
                 return predicate.test(element);
             })
@@ -327,9 +333,7 @@ match.every = function(predicate) {
 };
 
 match.some = function(predicate) {
-    if (!isMatcher(predicate)) {
-        throw new TypeError("Matcher expected");
-    }
+    assertMatcher(predicate);
 
     return match(function(actual) {
         if (typeOf(actual) === "object") {
@@ -339,8 +343,7 @@ match.some = function(predicate) {
         }
 
         return (
-            !!actual &&
-            typeOf(actual.forEach) === "function" &&
+            isIterable(actual) &&
             !every(actual, function(element) {
                 return !predicate.test(element);
             })