Update vendor/backbone and vendor/underscore.

vendor/underscore/test/cross-document.js

@@ -33,95 +33,95 @@
   );
   iDoc.close();
 
-  test('isEqual', function() {
+  test('isEqual', function(assert) {
 
-    ok(!_.isEqual(iNumber, 101));
-    ok(_.isEqual(iNumber, 100));
+    assert.ok(!_.isEqual(iNumber, 101));
+    assert.ok(_.isEqual(iNumber, 100));
 
     // Objects from another frame.
-    ok(_.isEqual({}, iObject), 'Objects with equivalent members created in different documents are equal');
+    assert.ok(_.isEqual({}, iObject), 'Objects with equivalent members created in different documents are equal');
 
     // Array from another frame.
-    ok(_.isEqual([1, 2, 3], iArray), 'Arrays with equivalent elements created in different documents are equal');
+    assert.ok(_.isEqual([1, 2, 3], iArray), 'Arrays with equivalent elements created in different documents are equal');
   });
 
-  test('isEmpty', function() {
-    ok(!_([iNumber]).isEmpty(), '[1] is not empty');
-    ok(!_.isEmpty(iArray), '[] is empty');
-    ok(_.isEmpty(iObject), '{} is empty');
+  test('isEmpty', function(assert) {
+    assert.ok(!_([iNumber]).isEmpty(), '[1] is not empty');
+    assert.ok(!_.isEmpty(iArray), '[] is empty');
+    assert.ok(_.isEmpty(iObject), '{} is empty');
   });
 
-  test('isElement', function() {
-    ok(!_.isElement('div'), 'strings are not dom elements');
-    ok(_.isElement(document.body), 'the body tag is a DOM element');
-    ok(_.isElement(iElement), 'even from another frame');
+  test('isElement', function(assert) {
+    assert.ok(!_.isElement('div'), 'strings are not dom elements');
+    assert.ok(_.isElement(document.body), 'the body tag is a DOM element');
+    assert.ok(_.isElement(iElement), 'even from another frame');
   });
 
-  test('isArguments', function() {
-    ok(_.isArguments(iArguments), 'even from another frame');
+  test('isArguments', function(assert) {
+    assert.ok(_.isArguments(iArguments), 'even from another frame');
   });
 
-  test('isObject', function() {
-    ok(_.isObject(iElement), 'even from another frame');
-    ok(_.isObject(iFunction), 'even from another frame');
+  test('isObject', function(assert) {
+    assert.ok(_.isObject(iElement), 'even from another frame');
+    assert.ok(_.isObject(iFunction), 'even from another frame');
   });
 
-  test('isArray', function() {
-    ok(_.isArray(iArray), 'even from another frame');
+  test('isArray', function(assert) {
+    assert.ok(_.isArray(iArray), 'even from another frame');
   });
 
-  test('isString', function() {
-    ok(_.isString(iString), 'even from another frame');
+  test('isString', function(assert) {
+    assert.ok(_.isString(iString), 'even from another frame');
   });
 
-  test('isNumber', function() {
-    ok(_.isNumber(iNumber), 'even from another frame');
+  test('isNumber', function(assert) {
+    assert.ok(_.isNumber(iNumber), 'even from another frame');
   });
 
-  test('isBoolean', function() {
-    ok(_.isBoolean(iBoolean), 'even from another frame');
+  test('isBoolean', function(assert) {
+    assert.ok(_.isBoolean(iBoolean), 'even from another frame');
   });
 
-  test('isFunction', function() {
-    ok(_.isFunction(iFunction), 'even from another frame');
+  test('isFunction', function(assert) {
+    assert.ok(_.isFunction(iFunction), 'even from another frame');
   });
 
-  test('isDate', function() {
-    ok(_.isDate(iDate), 'even from another frame');
+  test('isDate', function(assert) {
+    assert.ok(_.isDate(iDate), 'even from another frame');
   });
 
-  test('isRegExp', function() {
-    ok(_.isRegExp(iRegExp), 'even from another frame');
+  test('isRegExp', function(assert) {
+    assert.ok(_.isRegExp(iRegExp), 'even from another frame');
   });
 
-  test('isNaN', function() {
-    ok(_.isNaN(iNaN), 'even from another frame');
+  test('isNaN', function(assert) {
+    assert.ok(_.isNaN(iNaN), 'even from another frame');
   });
 
-  test('isNull', function() {
-    ok(_.isNull(iNull), 'even from another frame');
+  test('isNull', function(assert) {
+    assert.ok(_.isNull(iNull), 'even from another frame');
   });
 
-  test('isUndefined', function() {
-    ok(_.isUndefined(iUndefined), 'even from another frame');
+  test('isUndefined', function(assert) {
+    assert.ok(_.isUndefined(iUndefined), 'even from another frame');
   });
 
-  test('isError', function() {
-    ok(_.isError(iError), 'even from another frame');
+  test('isError', function(assert) {
+    assert.ok(_.isError(iError), 'even from another frame');
   });
 
   if (typeof ActiveXObject != 'undefined') {
-    test('IE host objects', function() {
+    test('IE host objects', function(assert) {
       var xml = new ActiveXObject('Msxml2.DOMDocument.3.0');
-      ok(!_.isNumber(xml));
-      ok(!_.isBoolean(xml));
-      ok(!_.isNaN(xml));
-      ok(!_.isFunction(xml));
-      ok(!_.isNull(xml));
-      ok(!_.isUndefined(xml));
+      assert.ok(!_.isNumber(xml));
+      assert.ok(!_.isBoolean(xml));
+      assert.ok(!_.isNaN(xml));
+      assert.ok(!_.isFunction(xml));
+      assert.ok(!_.isNull(xml));
+      assert.ok(!_.isUndefined(xml));
     });
 
-    test('#1621 IE 11 compat mode DOM elements are not functions', function() {
+    test('#1621 IE 11 compat mode DOM elements are not functions', function(assert) {
       var fn = function() {};
       var xml = new ActiveXObject('Msxml2.DOMDocument.3.0');
       var div = document.createElement('div');
@@ -132,9 +132,9 @@
         _.isFunction(fn);
       }
 
-      equal(_.isFunction(xml), false);
-      equal(_.isFunction(div), false);
-      equal(_.isFunction(fn), true);
+      assert.equal(_.isFunction(xml), false);
+      assert.equal(_.isFunction(div), false);
+      assert.equal(_.isFunction(fn), true);
     });
   }