Update benchmark and underscore vendor files.

vendor/underscore/test/utility.js

@@ -1,8 +1,8 @@
 (function() {
-
+  var _ = typeof require == 'function' ? require('..') : window._;
   var templateSettings;
 
-  module('Utility', {
+  QUnit.module('Utility', {
 
     setup: function() {
       templateSettings = _.clone(_.templateSettings);
@@ -21,13 +21,13 @@
   });
 
   test('identity', function() {
-    var moe = {name : 'moe'};
-    equal(_.identity(moe), moe, 'moe is the same as his identity');
+    var stooge = {name : 'moe'};
+    equal(_.identity(stooge), stooge, 'stooge is the same as his identity');
   });
 
   test('constant', function() {
-    var moe = {name : 'moe'};
-    equal(_.constant(moe)(), moe, 'should create a function that returns moe');
+    var stooge = {name : 'moe'};
+    equal(_.constant(stooge)(), stooge, 'should create a function that returns stooge');
   });
 
   test('noop', function() {
@@ -35,8 +35,28 @@
   });
 
   test('property', function() {
-    var moe = {name : 'moe'};
-    equal(_.property('name')(moe), 'moe', 'should return the property with the given name');
+    var stooge = {name : 'moe'};
+    equal(_.property('name')(stooge), 'moe', 'should return the property with the given name');
+    equal(_.property('name')(null), undefined, 'should return undefined for null values');
+    equal(_.property('name')(undefined), undefined, 'should return undefined for undefined values');
+  });
+  
+  test('propertyOf', function() {
+    var stoogeRanks = _.propertyOf({curly: 2, moe: 1, larry: 3});
+    equal(stoogeRanks('curly'), 2, 'should return the property with the given name');
+    equal(stoogeRanks(null), undefined, 'should return undefined for null values');
+    equal(stoogeRanks(undefined), undefined, 'should return undefined for undefined values');
+    
+    function MoreStooges() { this.shemp = 87; }
+    MoreStooges.prototype = {curly: 2, moe: 1, larry: 3};
+    var moreStoogeRanks = _.propertyOf(new MoreStooges());
+    equal(moreStoogeRanks('curly'), 2, 'should return properties from further up the prototype chain');
+    
+    var nullPropertyOf = _.propertyOf(null);
+    equal(nullPropertyOf('curly'), undefined, 'should return undefined when obj is null');
+    
+    var undefPropertyOf = _.propertyOf(undefined);
+    equal(undefPropertyOf('curly'), undefined, 'should return undefined when obj is undefined');
   });
 
   test('random', function() {
@@ -268,6 +288,41 @@
     strictEqual(_.result(null, 'x'), undefined);
   });
 
+  test('result returns a default value if object is null or undefined', function() {
+    strictEqual(_.result(null, 'b', 'default'), 'default');
+    strictEqual(_.result(undefined, 'c', 'default'), 'default');
+    strictEqual(_.result(''.match('missing'), 1, 'default'), 'default');
+  });
+
+  test('result returns a default value if property of object is missing', function() {
+    strictEqual(_.result({d: null}, 'd', 'default'), null);
+    strictEqual(_.result({e: false}, 'e', 'default'), false);
+  });
+
+  test('result only returns the default value if the object does not have the property or is undefined', function() {
+    strictEqual(_.result({}, 'b', 'default'), 'default');
+    strictEqual(_.result({d: undefined}, 'd', 'default'), 'default');
+  });
+
+  test('result does not return the default if the property of an object is found in the prototype', function() {
+    var Foo = function(){};
+    Foo.prototype.bar = 1;
+    strictEqual(_.result(new Foo, 'bar', 2), 1);
+  });
+
+  test('result does use the fallback when the result of invoking the property is undefined', function() {
+    var obj = {a: function() {}};
+    strictEqual(_.result(obj, 'a', 'failed'), undefined);
+  });
+
+  test('result fallback can use a function', function() {
+    var obj = {a: [1, 2, 3]};
+    strictEqual(_.result(obj, 'b', _.constant(5)), 5);
+    strictEqual(_.result(obj, 'b', function() {
+      return this.a;
+    }), obj.a, 'called with context');
+  });
+
   test('_.templateSettings.variable', function() {
     var s = '<%=data.x%>';
     var data = {x: 'x'};