Improving test coverage

Author: andrewplummer

Diff for: lib/common.js

@@ -831,6 +831,7 @@ function iterateOverSparseArray(arr, fn, fromIndex, loop) {
 function getSparseArrayIndexes(arr, fromIndex, loop, fromRight) {
   var indexes = [], i;
   for (i in arr) {
+    // istanbul ignore next
     if (isArrayIndex(i) && (loop || (fromRight ? i <= fromIndex : i >= fromIndex))) {
       indexes.push(+i);
     }
@@ -877,7 +878,7 @@ function mapWithShortcuts(el, f, context, mapArgs) {
   if (!f) {
     return el;
   } else if (f.apply) {
-    return f.apply(context, mapArgs || []);
+    return f.apply(context, mapArgs);
   } else if (isArray(f)) {
     return f.map(function(m) {
       return mapWithShortcuts(el, m, context, mapArgs);
@@ -1135,14 +1136,17 @@ function createFormatMatcher(bracketMatcher, percentMatcher, precheck) {
 var Inflections = {};
 
 function getAcronym(str) {
+  // istanbul ignore next
   return Inflections.acronyms && Inflections.acronyms.find(str);
 }
 
 function getHumanWord(str) {
+  // istanbul ignore next
   return Inflections.human && Inflections.human.find(str);
 }
 
 function runHumanRules(str) {
+  // istanbul ignore next
   return Inflections.human && Inflections.human.runRules(str) || str;
 }
 

Diff for: lib/core.js

@@ -28,6 +28,7 @@ var PROPERTY_DESCRIPTOR_SUPPORT = !!(Object.defineProperty && Object.definePrope
 
 // The global context. Rhino uses a different "global" keyword so
 // do an extra check to be sure that it's actually the global context.
+// istanbul ignore next
 var globalContext = typeof global !== 'undefined' && global.Object === Object ? global : this;
 
 // Is the environment node?
@@ -43,6 +44,7 @@ var namespacesByName = {};
 var namespacesByClassString = {};
 
 // Defining properties.
+// istanbul ignore next
 var defineProperty = PROPERTY_DESCRIPTOR_SUPPORT ?  Object.defineProperty : definePropertyShim;
 
 // A default chainable class for unknown types.

Diff for: lib/date.js

@@ -430,7 +430,8 @@ var FormatTokensBase = [
       // It will continue to be supported for Node and usage with the
       // understanding that it may be blank.
       var match = d.toString().match(TIMEZONE_ABBREVIATION_REG);
-      return match ? match[1]: '';
+      // istanbul ignore next
+      return match ? match[1] : '';
     }
   },
   {

Diff for: test/browser/javascripts/suite-ui.js

@@ -69,8 +69,8 @@
     }
   };
 
-  function getStringified(p) {
-    var str, arr, isArray = p && p.join, arrayHasUndefined;
+  function getStringified(p, stack) {
+    var str, arr, isArray = p && p.join, arrayHasUndefined, isCyc;
     if (p && p.getTime && p.setHours) {
       return p.toString();
     }
@@ -80,6 +80,9 @@
     if(typeof p !== 'object') return String(p);
     str = isArray ? '[' : '{';
     arr = [];
+    stack = stack || [];
+
+    stringify:
     for(var key in p){
       if(!p.hasOwnProperty(key)) continue;
       if(p[key] === undefined) {
@@ -89,7 +92,21 @@
         if (typeof val === 'string') {
           val = '"' + val + '"';
         }
-        arr.push((isArray ? '' : key + ': ') + getStringified(val));
+        isCyc = false;
+
+        // Cyclic structure check
+        if (stack.length > 1) {
+          var i = stack.length;
+          while (i--) {
+            if (stack[i] === val) {
+              arr.push(key + ':CYC');
+              continue stringify;
+            }
+          }
+        }
+
+        stack.push(val);
+        arr.push((isArray ? '' : key + ': ') + getStringified(val, stack));
       }
     }
     str += arr.join(',');

Diff for: test/suite/suite.js

@@ -344,7 +344,7 @@
 
   // Equality test methods.
 
-  function isEqual(one, two) {
+  function isEqual(one, two, stack) {
     var type, klass;
 
     type = typeof one;
@@ -364,7 +364,7 @@
     } else if (klass === '[object Array]' || klass === '[object Arguments]') {
       return arrayIsEqual(one, two) && klass === testInternalToString.call(two);
     } else if (klass === '[object Object]' && ('hasOwnProperty' in one) && type === 'object') {
-      return objectIsEqual(one, two) && klass === testInternalToString.call(two);
+      return objectIsEqual(one, two, stack) && klass === testInternalToString.call(two);
     } else if (klass === '[object Number]' && isNaN(one) && isNaN(two)) {
       return true;
     } else if (klass === '[object String]' || klass === '[object Number]') {
@@ -415,13 +415,34 @@
     return result && onep === twop;
   }
 
-  function objectIsEqual(one, two) {
+  function objectIsEqual(one, two, stack) {
     var onep = 0, twop = 0, key;
+
+    stack = stack || [];
+
     if (one && two) {
+      isEqual:
       for(key in one) {
         if (!one.hasOwnProperty(key)) continue;
         onep++;
-        if (!isEqual(one[key], two[key])) {
+
+        // Cyclic structure check
+        if (stack.length > 1) {
+          var i = stack.length;
+          while (i--) {
+            if (stack[i] === one[key]) {
+              if (one[key] !== two[key]) {
+                return false;
+              } else {
+                continue isEqual;
+              }
+            }
+          }
+        }
+
+        stack.push(one[key]);
+
+        if (!isEqual(one[key], two[key], stack)) {
           return false;
         }
       }

Diff for: test/tests/array.js

@@ -420,6 +420,13 @@ namespace('Array', function () {
     test([o1, o2], [o1], 'instances | same deep reference is equal');
     test([o1, o3], [o1, o3], 'instances | different deep reference is not equal');
 
+    var foo = {};
+    test([{foo:foo}], [{foo:foo}], 'Handles cyclic structures');
+
+    var foo = {};
+    foo.bar = foo;
+    test([foo], [foo], 'Handles cyclic structures');
+
   });
 
   method('flatten', function() {

Diff for: test/tests/date.js

@@ -128,6 +128,8 @@ namespace('Date', function () {
     assertDateParsed('Friday',    opt, testCreateDate('Friday'));
     assertDateParsed('Saturday',  opt, testCreateDate('Saturday'));
 
+    // Relative dates with future
+    assertDateParsed('the 15th', { future: true }, testDateSet(getRelativeDateReset(0,1),{date:15}));
 
     // fromUTC option
 

Diff for: test/tests/es7/array.js

@@ -57,6 +57,11 @@ namespace('Array', function () {
       Array.prototype.includes.call({length: thrower, 0: true}, true);
     }, 'fromIndex conversion throws', RangeError);
 
+    equal([0].includes(0),   true,  '[0] includes 0');
+    equal([0].includes(-0),  false, '[0] includes -0');
+    equal([-0].includes(0),  false, '[0] includes 0');
+    equal([-0].includes(-0), true,  '[0] includes -0');
+
   });
 
 });