Update deps.

vendor/underscore/test/collections.js

@@ -12,7 +12,7 @@
     deepEqual(answers, [5, 10, 15], 'context object property accessed');
 
     answers = [];
-    _.forEach([1, 2, 3], function(num){ answers.push(num); });
+    _.each([1, 2, 3], function(num){ answers.push(num); });
     deepEqual(answers, [1, 2, 3], 'aliased as "forEach"');
 
     answers = [];
@@ -43,17 +43,26 @@
     equal(answers, 100, 'enumerates [0, length)');
   });
 
+  test('forEach', function() {
+    strictEqual(_.each, _.forEach, 'alias for each');
+  });
+
+  test('lookupIterator with contexts', function() {
+    _.each([true, false, 'yes', '', 0, 1, {}], function(context) {
+      _.each([1], function() {
+        equal(this, context);
+      }, context);
+    });
+  });
+
   test('map', function() {
     var doubled = _.map([1, 2, 3], function(num){ return num * 2; });
     deepEqual(doubled, [2, 4, 6], 'doubled numbers');
 
-    doubled = _.collect([1, 2, 3], function(num){ return num * 2; });
-    deepEqual(doubled, [2, 4, 6], 'aliased as "collect"');
-
     var tripled = _.map([1, 2, 3], function(num){ return num * this.multiplier; }, {multiplier : 3});
     deepEqual(tripled, [3, 6, 9], 'tripled numbers with context');
 
-    var doubled = _([1, 2, 3]).map(function(num){ return num * 2; });
+    doubled = _([1, 2, 3]).map(function(num){ return num * 2; });
     deepEqual(doubled, [2, 4, 6], 'OO-style doubled numbers');
 
     if (document.querySelectorAll) {
@@ -61,13 +70,24 @@
       deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on NodeLists.');
     }
 
-    var ids = _.map({length: 2, 0: {id: '1'}, 1: {id: '2'}}, function(n){
+    ids = _.map({length: 2, 0: {id: '1'}, 1: {id: '2'}}, function(n){
       return n.id;
     });
     deepEqual(ids, ['1', '2'], 'Can use collection methods on Array-likes.');
 
-    var ifnull = _.map(null, function(){});
-    ok(_.isArray(ifnull) && ifnull.length === 0, 'handles a null properly');
+    deepEqual(_.map(null, _.noop), [], 'handles a null properly');
+
+    deepEqual(_.map([1], function() {
+      return this.length;
+    }, [5]), [1], 'called with context');
+
+    // Passing a property name like _.pluck.
+    var people = [{name : 'moe', age : 30}, {name : 'curly', age : 50}];
+    deepEqual(_.map(people, 'name'), ['moe', 'curly'], 'predicate string map to object properties');
+  });
+
+  test('collect', function() {
+    strictEqual(_.map, _.collect, 'alias for map');
   });
 
   test('reduce', function() {
@@ -84,50 +104,41 @@
     sum = _([1, 2, 3]).reduce(function(sum, num){ return sum + num; }, 0);
     equal(sum, 6, 'OO-style reduce');
 
-    var sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; });
+    sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; });
     equal(sum, 6, 'default initial value');
 
     var prod = _.reduce([1, 2, 3, 4], function(prod, num){ return prod * num; });
     equal(prod, 24, 'can reduce via multiplication');
 
-    var ifnull;
-    try {
-      _.reduce(null, function(){});
-    } catch (ex) {
-      ifnull = ex;
-    }
-    ok(ifnull instanceof TypeError, 'handles a null (without initial value) properly');
+    ok(_.reduce(null, _.noop, 138) === 138, 'handles a null (with initial value) properly');
+    equal(_.reduce([], _.noop, undefined), undefined, 'undefined can be passed as a special case');
+    equal(_.reduce([_], _.noop), _, 'collection of length one with no initial value returns the first item');
 
-    ok(_.reduce(null, function(){}, 138) === 138, 'handles a null (with initial value) properly');
-    equal(_.reduce([], function(){}, undefined), undefined, 'undefined can be passed as a special case');
-    raises(function() { _.reduce([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
+    raises(function() { _.reduce([], _.noop); }, TypeError, 'throws an error for empty arrays with no initial value');
+    raises(function() {_.reduce(null, _.noop);}, TypeError, 'handles a null (without initial value) properly');
+  });
+
+  test('foldl', function() {
+    strictEqual(_.reduce, _.foldl, 'alias for reduce');
   });
 
   test('reduceRight', function() {
     var list = _.reduceRight(['foo', 'bar', 'baz'], function(memo, str){ return memo + str; }, '');
     equal(list, 'bazbarfoo', 'can perform right folds');
 
-    var list = _.foldr(['foo', 'bar', 'baz'], function(memo, str){ return memo + str; }, '');
-    equal(list, 'bazbarfoo', 'aliased as "foldr"');
-
-    var list = _.foldr(['foo', 'bar', 'baz'], function(memo, str){ return memo + str; });
+    list = _.reduceRight(['foo', 'bar', 'baz'], function(memo, str){ return memo + str; });
     equal(list, 'bazbarfoo', 'default initial value');
 
-    var ifnull;
-    try {
-      _.reduceRight(null, function(){});
-    } catch (ex) {
-      ifnull = ex;
-    }
-    ok(ifnull instanceof TypeError, 'handles a null (without initial value) properly');
-
     var sum = _.reduceRight({a: 1, b: 2, c: 3}, function(sum, num){ return sum + num; });
     equal(sum, 6, 'default initial value on object');
 
-    ok(_.reduceRight(null, function(){}, 138) === 138, 'handles a null (with initial value) properly');
+    ok(_.reduceRight(null, _.noop, 138) === 138, 'handles a null (with initial value) properly');
+    equal(_.reduceRight([_], _.noop), _, 'collection of length one with no initial value returns the first item');
 
-    equal(_.reduceRight([], function(){}, undefined), undefined, 'undefined can be passed as a special case');
-    raises(function() { _.reduceRight([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
+    equal(_.reduceRight([], _.noop, undefined), undefined, 'undefined can be passed as a special case');
+
+    raises(function() { _.reduceRight([], _.noop); }, TypeError, 'throws an error for empty arrays with no initial value');
+    raises(function() {_.reduceRight(null, _.noop);}, TypeError, 'handles a null (without initial value) properly');
 
     // Assert that the correct arguments are being passed.
 
@@ -136,12 +147,12 @@
         object = {a: 1, b: 2},
         lastKey = _.keys(object).pop();
 
-    var expected = lastKey == 'a'
+    var expected = lastKey === 'a'
       ? [memo, 1, 'a', object]
       : [memo, 2, 'b', object];
 
     _.reduceRight(object, function() {
-      args || (args = _.toArray(arguments));
+      if (!args) args = _.toArray(arguments);
     }, memo);
 
     deepEqual(args, expected);
@@ -152,79 +163,155 @@
     lastKey = _.keys(object).pop();
     args = null;
 
-    expected = lastKey == '2'
+    expected = lastKey === '2'
       ? [memo, 'a', '2', object]
       : [memo, 'b', '1', object];
 
     _.reduceRight(object, function() {
-      args || (args = _.toArray(arguments));
+      if (!args) args = _.toArray(arguments);
     }, memo);
 
     deepEqual(args, expected);
   });
 
+  test('foldr', function() {
+    strictEqual(_.reduceRight, _.foldr, 'alias for reduceRight');
+  });
+
   test('find', function() {
     var array = [1, 2, 3, 4];
     strictEqual(_.find(array, function(n) { return n > 2; }), 3, 'should return first found `value`');
     strictEqual(_.find(array, function() { return false; }), void 0, 'should return `undefined` if `value` is not found');
-  });
 
-  test('detect', function() {
-    var result = _.detect([1, 2, 3], function(num){ return num * 2 == 4; });
+    // Matching an object like _.findWhere.
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}, {a: 2, b: 4}];
+    deepEqual(_.find(list, {a: 1}), {a: 1, b: 2}, 'can be used as findWhere');
+    deepEqual(_.find(list, {b: 4}), {a: 1, b: 4});
+    ok(!_.find(list, {c: 1}), 'undefined when not found');
+    ok(!_.find([], {c: 1}), 'undefined when searching empty list');
+
+    var result = _.find([1, 2, 3], function(num){ return num * 2 === 4; });
     equal(result, 2, 'found the first "2" and broke the loop');
   });
 
-  test('select', function() {
-    var evens = _.select([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
-    deepEqual(evens, [2, 4, 6], 'selected each even number');
+  test('detect', function() {
+    strictEqual(_.detect, _.find, 'alias for detect');
+  });
 
-    evens = _.filter([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
-    deepEqual(evens, [2, 4, 6], 'aliased as "filter"');
+  test('filter', function() {
+    var evenArray = [1, 2, 3, 4, 5, 6];
+    var evenObject = {one: 1, two: 2, three: 3};
+    var isEven = function(num){ return num % 2 === 0; };
+
+    deepEqual(_.filter(evenArray, isEven), [2, 4, 6]);
+    deepEqual(_.filter(evenObject, isEven), [2], 'can filter objects');
+    deepEqual(_.filter([{}, evenObject, []], 'two'), [evenObject], 'predicate string map to object properties');
+
+    _.filter([1], function() {
+      equal(this, evenObject, 'given context');
+    }, evenObject);
+
+    // Can be used like _.where.
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
+    deepEqual(_.filter(list, {a: 1}), [{a: 1, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}]);
+    deepEqual(_.filter(list, {b: 2}), [{a: 1, b: 2}, {a: 2, b: 2}]);
+    deepEqual(_.filter(list, {}), list, 'Empty object accepts all items');
+    deepEqual(_(list).filter({}), list, 'OO-filter');
+  });
+
+  test('select', function() {
+    strictEqual(_.filter, _.select, 'alias for filter');
   });
 
   test('reject', function() {
-    var odds = _.reject([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
+    var odds = _.reject([1, 2, 3, 4, 5, 6], function(num){ return num % 2 === 0; });
     deepEqual(odds, [1, 3, 5], 'rejected each even number');
 
     var context = 'obj';
 
     var evens = _.reject([1, 2, 3, 4, 5, 6], function(num){
       equal(context, 'obj');
-      return num % 2 != 0;
+      return num % 2 !== 0;
     }, context);
     deepEqual(evens, [2, 4, 6], 'rejected each odd number');
+
+    deepEqual(_.reject([odds, {one: 1, two: 2, three: 3}], 'two'), [odds], 'predicate string map to object properties');
+
+    // Can be used like _.where.
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
+    deepEqual(_.reject(list, {a: 1}), [{a: 2, b: 2}]);
+    deepEqual(_.reject(list, {b: 2}), [{a: 1, b: 3}, {a: 1, b: 4}]);
+    deepEqual(_.reject(list, {}), [], 'Returns empty list given empty object');
+    deepEqual(_.reject(list, []), [], 'Returns empty list given empty array');
+  });
+
+  test('every', function() {
+    ok(_.every([], _.identity), 'the empty set');
+    ok(_.every([true, true, true], _.identity), 'every true values');
+    ok(!_.every([true, false, true], _.identity), 'one false value');
+    ok(_.every([0, 10, 28], function(num){ return num % 2 === 0; }), 'even numbers');
+    ok(!_.every([0, 11, 28], function(num){ return num % 2 === 0; }), 'an odd number');
+    ok(_.every([1], _.identity) === true, 'cast to boolean - true');
+    ok(_.every([0], _.identity) === false, 'cast to boolean - false');
+    ok(!_.every([undefined, undefined, undefined], _.identity), 'works with arrays of undefined');
+
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
+    ok(!_.every(list, {a: 1, b: 2}), 'Can be called with object');
+    ok(_.every(list, 'a'), 'String mapped to object property');
+
+    list = [{a: 1, b: 2}, {a: 2, b: 2, c: true}];
+    ok(_.every(list, {b: 2}), 'Can be called with object');
+    ok(!_.every(list, 'c'), 'String mapped to object property');
+
+    ok(_.every({a: 1, b: 2, c: 3, d: 4}, _.isNumber), 'takes objects');
+    ok(!_.every({a: 1, b: 2, c: 3, d: 4}, _.isObject), 'takes objects');
+    ok(_.every(['a', 'b', 'c', 'd'], _.hasOwnProperty, {a: 1, b: 2, c: 3, d: 4}), 'context works');
+    ok(!_.every(['a', 'b', 'c', 'd', 'f'], _.hasOwnProperty, {a: 1, b: 2, c: 3, d: 4}), 'context works');
   });
 
   test('all', function() {
-    ok(_.all([], _.identity), 'the empty set');
-    ok(_.all([true, true, true], _.identity), 'all true values');
-    ok(!_.all([true, false, true], _.identity), 'one false value');
-    ok(_.all([0, 10, 28], function(num){ return num % 2 == 0; }), 'even numbers');
-    ok(!_.all([0, 11, 28], function(num){ return num % 2 == 0; }), 'an odd number');
-    ok(_.all([1], _.identity) === true, 'cast to boolean - true');
-    ok(_.all([0], _.identity) === false, 'cast to boolean - false');
-    ok(_.every([true, true, true], _.identity), 'aliased as "every"');
-    ok(!_.all([undefined, undefined, undefined], _.identity), 'works with arrays of undefined');
+    strictEqual(_.all, _.every, 'alias for all');
+  });
+
+  test('some', function() {
+    ok(!_.some([]), 'the empty set');
+    ok(!_.some([false, false, false]), 'all false values');
+    ok(_.some([false, false, true]), 'one true value');
+    ok(_.some([null, 0, 'yes', false]), 'a string');
+    ok(!_.some([null, 0, '', false]), 'falsy values');
+    ok(!_.some([1, 11, 29], function(num){ return num % 2 === 0; }), 'all odd numbers');
+    ok(_.some([1, 10, 29], function(num){ return num % 2 === 0; }), 'an even number');
+    ok(_.some([1], _.identity) === true, 'cast to boolean - true');
+    ok(_.some([0], _.identity) === false, 'cast to boolean - false');
+    ok(_.some([false, false, true]));
+
+    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
+    ok(!_.some(list, {a: 5, b: 2}), 'Can be called with object');
+    ok(_.some(list, 'a'), 'String mapped to object property');
+
+    list = [{a: 1, b: 2}, {a: 2, b: 2, c: true}];
+    ok(_.some(list, {b: 2}), 'Can be called with object');
+    ok(!_.some(list, 'd'), 'String mapped to object property');
+
+    ok(_.some({a: '1', b: '2', c: '3', d: '4', e: 6}, _.isNumber), 'takes objects');
+    ok(!_.some({a: 1, b: 2, c: 3, d: 4}, _.isObject), 'takes objects');
+    ok(_.some(['a', 'b', 'c', 'd'], _.hasOwnProperty, {a: 1, b: 2, c: 3, d: 4}), 'context works');
+    ok(!_.some(['x', 'y', 'z'], _.hasOwnProperty, {a: 1, b: 2, c: 3, d: 4}), 'context works');
   });
 
   test('any', function() {
-    ok(!_.any([]), 'the empty set');
-    ok(!_.any([false, false, false]), 'all false values');
-    ok(_.any([false, false, true]), 'one true value');
-    ok(_.any([null, 0, 'yes', false]), 'a string');
-    ok(!_.any([null, 0, '', false]), 'falsy values');
-    ok(!_.any([1, 11, 29], function(num){ return num % 2 == 0; }), 'all odd numbers');
-    ok(_.any([1, 10, 29], function(num){ return num % 2 == 0; }), 'an even number');
-    ok(_.any([1], _.identity) === true, 'cast to boolean - true');
-    ok(_.any([0], _.identity) === false, 'cast to boolean - false');
-    ok(_.some([false, false, true]), 'aliased as "some"');
+    strictEqual(_.any, _.some, 'alias for any');
+  });
+
+  test('contains', function() {
+    ok(_.contains([1, 2, 3], 2), 'two is in the array');
+    ok(!_.contains([1, 3, 9], 2), 'two is not in the array');
+    ok(_.contains({moe: 1, larry: 3, curly: 9}, 3) === true, '_.contains on objects checks their values');
+    ok(_([1, 2, 3]).contains(2), 'OO-style contains');
   });
 
   test('include', function() {
-    ok(_.include([1, 2, 3], 2), 'two is in the array');
-    ok(!_.include([1, 3, 9], 2), 'two is not in the array');
-    ok(_.contains({moe: 1, larry: 3, curly: 9}, 3) === true, '_.include on objects checks their values');
-    ok(_([1, 2, 3]).include(2), 'OO-style include');
+    strictEqual(_.contains, _.include, 'alias for contains');
   });
 
   test('invoke', function() {
@@ -257,8 +344,10 @@
   });
 
   test('pluck', function() {
-    var people = [{name : 'moe', age : 30}, {name : 'curly', age : 50}];
+    var people = [{name: 'moe', age: 30}, {name: 'curly', age: 50}];
     deepEqual(_.pluck(people, 'name'), ['moe', 'curly'], 'pulls names out of objects');
+    //compat: most flexible handling of edge cases
+    deepEqual(_.pluck([{'[object Object]': 1}], {}), [1]);
   });
 
   test('where', function() {
@@ -271,6 +360,10 @@
     equal(result[0].a, 1);
     result = _.where(list, {});
     equal(result.length, list.length);
+
+    function test() {}
+    test.map = _.map;
+    deepEqual(_.where([_, {a: 1, b: 2}, _], test), [_, _], 'checks properties given function');
   });
 
   test('findWhere', function() {
@@ -280,14 +373,29 @@
     result = _.findWhere(list, {b: 4});
     deepEqual(result, {a: 1, b: 4});
 
-    result = _.findWhere(list, {c: 1})
+    result = _.findWhere(list, {c: 1});
     ok(_.isUndefined(result), 'undefined when not found');
 
     result = _.findWhere([], {c: 1});
     ok(_.isUndefined(result), 'undefined when searching empty list');
+
+    function test() {}
+    test.map = _.map;
+    equal(_.findWhere([_, {a: 1, b: 2}, _], test), _, 'checks properties given function');
+
+    function TestClass() {
+      this.y = 5;
+      this.x = 'foo';
+    }
+    var expect = {c: 1, x: 'foo', y: 5};
+    deepEqual(_.findWhere([{y: 5, b: 6}, expect], new TestClass()), expect, 'uses class instance properties');
   });
 
   test('max', function() {
+    equal(-Infinity, _.max(null), 'can handle null/undefined');
+    equal(-Infinity, _.max(undefined), 'can handle null/undefined');
+    equal(-Infinity, _.max(null, _.identity), 'can handle null/undefined');
+
     equal(3, _.max([1, 2, 3]), 'can perform a regular Math.max');
 
     var neg = _.max([1, 2, 3], function(num){ return -num; });
@@ -306,9 +414,19 @@
     var b = {x: -Infinity};
     var iterator = function(o){ return o.x; };
     equal(_.max([a, b], iterator), a, 'Respects iterator return value of -Infinity');
+
+    deepEqual(_.max([{'a': 1}, {'a': 0, 'b': 3}, {'a': 4}, {'a': 2}], 'a'), {'a': 4}, 'String keys use property iterator');
+
+    deepEqual(_.max([0, 2], function(a){ return a * this.x; }, {x: 1}), 2, 'Iterator context');
+    deepEqual(_.max([[1], [2, 3], [-1, 4], [5]], 0), [5], 'Lookup falsy iterator');
+    deepEqual(_.max([{0: 1}, {0: 2}, {0: -1}, {a: 1}], 0), {0: 2}, 'Lookup falsy iterator');
   });
 
   test('min', function() {
+    equal(Infinity, _.min(null), 'can handle null/undefined');
+    equal(Infinity, _.min(undefined), 'can handle null/undefined');
+    equal(Infinity, _.min(null, _.identity), 'can handle null/undefined');
+
     equal(1, _.min([1, 2, 3]), 'can perform a regular Math.min');
 
     var neg = _.min([1, 2, 3], function(num){ return -num; });
@@ -331,6 +449,12 @@
     var b = {x: Infinity};
     var iterator = function(o){ return o.x; };
     equal(_.min([a, b], iterator), a, 'Respects iterator return value of Infinity');
+
+    deepEqual(_.min([{'a': 1}, {'a': 0, 'b': 3}, {'a': 4}, {'a': 2}], 'a'), {'a': 0, 'b': 3}, 'String keys use property iterator');
+
+    deepEqual(_.min([0, 2], function(a){ return a * this.x; }, {x: -1}), 2, 'Iterator context');
+    deepEqual(_.min([[1], [2, 3], [-1, 4], [5]], 0), [-1, 4], 'Lookup falsy iterator');
+    deepEqual(_.min([{0: 1}, {0: 2}, {0: -1}, {a: 1}], 0), {0: -1}, 'Lookup falsy iterator');
   });
 
   test('sortBy', function() {
@@ -341,7 +465,7 @@
     var list = [undefined, 4, 1, undefined, 3, 2];
     deepEqual(_.sortBy(list, _.identity), [1, 2, 3, 4, undefined, undefined], 'sortBy with undefined values');
 
-    var list = ['one', 'two', 'three', 'four', 'five'];
+    list = ['one', 'two', 'three', 'four', 'five'];
     var sorted = _.sortBy(list, 'length');
     deepEqual(sorted, ['one', 'two', 'four', 'five', 'three'], 'sorted by length');
 
@@ -368,7 +492,9 @@
 
     deepEqual(actual, collection, 'sortBy should be stable');
 
-    var list = ['q', 'w', 'e', 'r', 't', 'y'];
+    deepEqual(_.sortBy(collection, 'x'), collection, 'sortBy accepts property string');
+
+    list = ['q', 'w', 'e', 'r', 't', 'y'];
     deepEqual(_.sortBy(list), ['e', 'q', 'r', 't', 'w', 'y'], 'uses _.identity if iterator is not specified');
   });
 
@@ -395,8 +521,8 @@
     var array = [{}];
     _.groupBy(array, function(value, index, obj){ ok(obj === array); });
 
-    var array = [1, 2, 1, 2, 3];
-    var grouped = _.groupBy(array);
+    array = [1, 2, 1, 2, 3];
+    grouped = _.groupBy(array);
     equal(grouped['1'].length, 2);
     equal(grouped['3'].length, 1);
 
@@ -405,14 +531,14 @@
       [1, 3],
       [2, 3]
     ];
-    deepEqual(_.groupBy(matrix, 0), {1: [[1, 2], [1, 3]], 2: [[2, 3]]})
-    deepEqual(_.groupBy(matrix, 1), {2: [[1, 2]], 3: [[1, 3], [2, 3]]})
+    deepEqual(_.groupBy(matrix, 0), {1: [[1, 2], [1, 3]], 2: [[2, 3]]});
+    deepEqual(_.groupBy(matrix, 1), {2: [[1, 2]], 3: [[1, 3], [2, 3]]});
   });
 
   test('indexBy', function() {
-    var parity = _.indexBy([1, 2, 3, 4, 5], function(num){ return num % 2 == 0; });
-    equal(parity['true'], 4);
-    equal(parity['false'], 5);
+    var parity = _.indexBy([1, 2, 3, 4, 5], function(num){ return num % 2 === 0; });
+    equal(parity.true, 4);
+    equal(parity.false, 5);
 
     var list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten'];
     var grouped = _.indexBy(list, 'length');
@@ -421,16 +547,16 @@
     equal(grouped['5'], 'eight');
 
     var array = [1, 2, 1, 2, 3];
-    var grouped = _.indexBy(array);
+    grouped = _.indexBy(array);
     equal(grouped['1'], 1);
     equal(grouped['2'], 2);
     equal(grouped['3'], 3);
   });
 
   test('countBy', function() {
-    var parity = _.countBy([1, 2, 3, 4, 5], function(num){ return num % 2 == 0; });
-    equal(parity['true'], 2);
-    equal(parity['false'], 3);
+    var parity = _.countBy([1, 2, 3, 4, 5], function(num){ return num % 2 === 0; });
+    equal(parity.true, 2);
+    equal(parity.false, 3);
 
     var list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten'];
     var grouped = _.countBy(list, 'length');
@@ -450,8 +576,8 @@
     var array = [{}];
     _.countBy(array, function(value, index, obj){ ok(obj === array); });
 
-    var array = [1, 2, 1, 2, 3];
-    var grouped = _.countBy(array);
+    array = [1, 2, 1, 2, 3];
+    grouped = _.countBy(array);
     equal(grouped['1'], 2);
     equal(grouped['3'], 1);
   });
@@ -476,17 +602,23 @@
 
   test('shuffle', function() {
     var numbers = _.range(10);
-    var shuffled = _.shuffle(numbers).sort();
+    var shuffled = _.shuffle(numbers);
     notStrictEqual(numbers, shuffled, 'original object is unmodified');
-    deepEqual(shuffled, numbers, 'contains the same members before and after shuffle');
+    ok(_.every(_.range(10), function() { //appears consistent?
+      return _.every(numbers, _.partial(_.contains, numbers));
+    }), 'contains the same members before and after shuffle');
+
+    shuffled = _.shuffle({a: 1, b: 2, c: 3, d: 4});
+    equal(shuffled.length, 4);
+    deepEqual(shuffled.sort(), [1, 2, 3, 4], 'works on objects');
   });
 
   test('sample', function() {
     var numbers = _.range(10);
-    var all_sampled = _.sample(numbers, 10).sort();
-    deepEqual(all_sampled, numbers, 'contains the same members before and after sample');
-    all_sampled = _.sample(numbers, 20).sort();
-    deepEqual(all_sampled, numbers, 'also works when sampling more objects than are present');
+    var allSampled = _.sample(numbers, 10).sort();
+    deepEqual(allSampled, numbers, 'contains the same members before and after sample');
+    allSampled = _.sample(numbers, 20).sort();
+    deepEqual(allSampled, numbers, 'also works when sampling more objects than are present');
     ok(_.contains(numbers, _.sample(numbers)), 'sampling a single element returns something from the array');
     strictEqual(_.sample([]), undefined, 'sampling empty array with no number returns undefined');
     notStrictEqual(_.sample([], 5), [], 'sampling empty array with a number returns an empty array');
@@ -536,7 +668,7 @@
     deepEqual(_.partition(list, function(x) { return x & 1; }), [[1, 3, 5], [0, 2, 4]], 'handles 0 and 1 return values');
     deepEqual(_.partition(list, function(x) { return x - 3; }), [[0, 1, 2, 4, 5], [3]], 'handles other numeric return values');
     deepEqual(_.partition(list, function(x) { return x > 1 ? null : true; }), [[0, 1], [2, 3, 4, 5]], 'handles null return values');
-    deepEqual(_.partition(list, function(x) { if(x < 2) return true; }), [[0, 1], [2, 3, 4, 5]], 'handles undefined return values');
+    deepEqual(_.partition(list, function(x) { if (x < 2) return true; }), [[0, 1], [2, 3, 4, 5]], 'handles undefined return values');
     deepEqual(_.partition({a: 1, b: 2, c: 3}, function(x) { return x > 1; }), [[2, 3], [1]], 'handles objects');
 
     deepEqual(_.partition(list, function(x, index) { return index % 2; }), [[1, 3, 5], [0, 2, 4]], 'can reference the array index');
@@ -547,8 +679,18 @@
     deepEqual(_.partition([{x: 1}, {x: 0}, {x: 1}], 'x'), [[{x: 1}, {x: 1}], [{x: 0}]], 'Takes a string');
 
     // Context
-    var predicate = function(x){ return x === this.x };
+    var predicate = function(x){ return x === this.x; };
     deepEqual(_.partition([1, 2, 3], predicate, {x: 2}), [[2], [1, 3]], 'partition takes a context argument');
+
+    deepEqual(_.partition([{a: 1}, {b: 2}, {a: 1, b: 2}], {a: 1}), [[{a: 1}, {a: 1, b: 2}], [{b: 2}]], 'predicate can be object');
+
+    var object = {a: 1};
+    _.partition(object, function(val, key, obj) {
+      equal(val, 1);
+      equal(key, 'a');
+      equal(obj, object);
+      equal(this, predicate);
+    }, predicate);
   });
 
-})();
+}());