Update deps.

vendor/backbone/test/collection.js

@@ -60,20 +60,6 @@
     strictEqual(collection.last().get('a'), 4);
   });
 
-  test("clone preserves model and comparator", 3, function() {
-    var Model = Backbone.Model.extend();
-    var comparator = function(model){ return model.id; };
-
-    var collection = new Backbone.Collection([{id: 1}], {
-      model: Model,
-      comparator: comparator
-    }).clone();
-    collection.add({id: 2});
-    ok(collection.at(0) instanceof Model);
-    ok(collection.at(1) instanceof Model);
-    strictEqual(collection.comparator, comparator);
-  });
-
   test("get", 6, function() {
     equal(col.get(0), d);
     equal(col.get(d.clone()), d);
@@ -1349,20 +1335,4 @@
     equal(c.models.length, 1);
   });
 
-  test('#3020: #set with {add: false} should not throw.', 2, function() {
-    var collection = new Backbone.Collection;
-    collection.set([{id: 1}], {add: false});
-    strictEqual(collection.length, 0);
-    strictEqual(collection.models.length, 0);
-  });
-
-  test("create with wait, model instance, #3028", 1, function() {
-    var collection = new Backbone.Collection();
-    var model = new Backbone.Model({id: 1});
-    model.sync = function(){
-      equal(this.collection, collection);
-    };
-    collection.create(model, {wait: true});
-  });
-
 })();

vendor/backbone/test/router.js

@@ -331,36 +331,6 @@
     Backbone.history.checkUrl();
   });
 
-  test("No events are triggered if #execute returns false.", 1, function() {
-    var Router = Backbone.Router.extend({
-
-      routes: {
-        foo: function() {
-          ok(true);
-        }
-      },
-
-      execute: function(callback, args) {
-        callback.apply(this, args);
-        return false;
-      }
-
-    });
-
-    var router = new Router;
-
-    router.on('route route:foo', function() {
-      ok(false);
-    });
-
-    Backbone.history.on('route', function() {
-      ok(false);
-    });
-
-    location.replace('http://example.com#foo');
-    Backbone.history.checkUrl();
-  });
-
   test("#933, #908 - leading slash", 2, function() {
     location.replace('http://example.com/root/foo');
 
@@ -405,7 +375,7 @@
     Backbone.history.navigate('charñ', {trigger: true});
     equal(router.charType, 'UTF');
     Backbone.history.navigate('char%C3%B1', {trigger: true});
-    equal(router.charType, 'UTF');
+    equal(router.charType, 'escaped');
   });
 
   test("#1185 - Use pathname when hashChange is not wanted.", 1, function() {
@@ -768,7 +738,7 @@
     var Router = Backbone.Router.extend({
       routes: {
         path: function(params){
-          strictEqual(params, 'x=y z');
+          strictEqual(params, 'x=y%20z');
         }
       }
     });
@@ -837,49 +807,4 @@
     Backbone.history.start({pushState: true});
   });
 
-  test('Router#execute receives callback, args, name.', 3, function() {
-    location.replace('http://example.com#foo/123/bar?x=y');
-    Backbone.history.stop();
-    Backbone.history = _.extend(new Backbone.History, {location: location});
-    var Router = Backbone.Router.extend({
-      routes: {'foo/:id/bar': 'foo'},
-      foo: function(){},
-      execute: function(callback, args, name) {
-        strictEqual(callback, this.foo);
-        deepEqual(args, ['123', 'x=y']);
-        strictEqual(name, 'foo');
-      }
-    });
-    var router = new Router;
-    Backbone.history.start();
-  });
-
-  test("pushState to hashChange with only search params.", 1, function() {
-    Backbone.history.stop();
-    location.replace('http://example.com?a=b');
-    location.replace = function(url) {
-      strictEqual(url, '/#?a=b');
-    };
-    Backbone.history = _.extend(new Backbone.History, {
-      location: location,
-      history: null
-    });
-    Backbone.history.start({pushState: true});
-  });
-
-  test("#3123 - History#navigate decodes before comparison.", 1, function() {
-    Backbone.history.stop();
-    location.replace('http://example.com/shop/search?keyword=short%20dress');
-    Backbone.history = _.extend(new Backbone.History, {
-      location: location,
-      history: {
-        pushState: function(){ ok(false); },
-        replaceState: function(){ ok(false); }
-      }
-    });
-    Backbone.history.start({pushState: true});
-    Backbone.history.navigate('shop/search?keyword=short%20dress', true);
-    strictEqual(Backbone.history.fragment, 'shop/search?keyword=short dress');
-  });
-
 })();

vendor/backbone/test/sync.js

@@ -207,15 +207,4 @@
     strictEqual(this.ajaxSettings.beforeSend(xhr), false);
   });
 
-  test('#2928 - Pass along `textStatus` and `errorThrown`.', 2, function() {
-    var model = new Backbone.Model;
-    model.url = '/test';
-    model.on('error', function(model, xhr, options) {
-      strictEqual(options.textStatus, 'textStatus');
-      strictEqual(options.errorThrown, 'errorThrown');
-    });
-    model.fetch();
-    this.ajaxSettings.error({}, 'textStatus', 'errorThrown');
-  });
-
 })();

vendor/backbone/test/view.js

@@ -20,22 +20,10 @@
     equal(view.el.other, void 0);
   });
 
-  test("$", 2, function() {
+  test("jQuery", 1, function() {
     var view = new Backbone.View;
     view.setElement('<p><a><b>test</b></a></p>');
-    var result = view.$('a b');
-
-    strictEqual(result[0].innerHTML, 'test');
-    ok(result.length === +result.length);
-  });
-
-  test("$el", 3, function() {
-    var view = new Backbone.View;
-    view.setElement('<p><a><b>test</b></a></p>');
-    strictEqual(view.el.nodeType, 1);
-
-    ok(view.$el instanceof Backbone.$);
-    strictEqual(view.$el[0], view.el);
+    strictEqual(view.$('a b').html(), 'test');
   });
 
   test("initialize", 1, function() {
@@ -72,17 +60,6 @@
     equal(counter2, 3);
   });
 
-  test("delegate", 2, function() {
-    var view = new Backbone.View({el: '#testElement'});
-    view.delegate('click', 'h1', function() {
-      ok(true);
-    });
-    view.delegate('click', function() {
-      ok(true);
-    });
-    view.$('h1').trigger('click');
-  });
-
   test("delegateEvents allows functions for callbacks", 3, function() {
     var view = new Backbone.View({el: '<p></p>'});
     view.counter = 0;
@@ -137,63 +114,6 @@
     equal(counter2, 3);
   });
 
-  test("undelegate", 0, function() {
-    view = new Backbone.View({el: '#testElement'});
-    view.delegate('click', function() { ok(false); });
-    view.delegate('click', 'h1', function() { ok(false); });
-
-    view.undelegate('click');
-
-    view.$('h1').trigger('click');
-    view.$el.trigger('click');
-  });
-
-  test("undelegate with passed handler", 1, function() {
-    view = new Backbone.View({el: '#testElement'});
-    var listener = function() { ok(false); };
-    view.delegate('click', listener);
-    view.delegate('click', function() { ok(true); });
-    view.undelegate('click', listener);
-    view.$el.trigger('click');
-  });
-
-  test("undelegate with selector", 2, function() {
-    view = new Backbone.View({el: '#testElement'});
-    view.delegate('click', function() { ok(true); });
-    view.delegate('click', 'h1', function() { ok(false); });
-    view.undelegate('click', 'h1');
-    view.$('h1').trigger('click');
-    view.$el.trigger('click');
-  });
-
-  test("undelegate with handler and selector", 2, function() {
-    view = new Backbone.View({el: '#testElement'});
-    view.delegate('click', function() { ok(true); });
-    var handler = function(){ ok(false); };
-    view.delegate('click', 'h1', handler);
-    view.undelegate('click', 'h1', handler);
-    view.$('h1').trigger('click');
-    view.$el.trigger('click');
-  });
-
-  test("tagName can be provided as a string", 1, function() {
-    var View = Backbone.View.extend({
-      tagName: 'span'
-    });
-
-    equal(new View().el.tagName, 'SPAN');
-  });
-
-  test("tagName can be provided as a function", 1, function() {
-    var View = Backbone.View.extend({
-      tagName: function() {
-        return 'p';
-      }
-    });
-
-    ok(new View().$el.is('p'));
-  });
-
   test("_ensureElement with DOM node el", 1, function() {
     var View = Backbone.View.extend({
       el: document.body
@@ -281,19 +201,26 @@
     equal(5, count);
   });
 
-  test("custom events", 2, function() {
+  test("custom events, with namespaces", 2, function() {
+    var count = 0;
+
     var View = Backbone.View.extend({
       el: $('body'),
-      events: {
-        "fake$event": function() { ok(true); }
+      events: function() {
+        return {"fake$event.namespaced": "run"};
+      },
+      run: function() {
+        count++;
       }
     });
 
     var view = new View;
     $('body').trigger('fake$event').trigger('fake$event');
+    equal(count, 2);
 
-    $('body').off('fake$event');
+    $('body').off('.namespaced');
     $('body').trigger('fake$event');
+    equal(count, 2);
   });
 
   test("#1048 - setElement uses provided object.", 2, function() {
@@ -337,11 +264,21 @@
     ok(!view2.el.id);
   });
 
+  test("#1228 - tagName can be provided as a function", 1, function() {
+    var View = Backbone.View.extend({
+      tagName: function() {
+        return 'p';
+      }
+    });
+
+    ok(new View().$el.is('p'));
+  });
+
   test("views stopListening", 0, function() {
     var View = Backbone.View.extend({
       initialize: function() {
-        this.listenTo(this.model, 'all x', function(){ ok(false); });
-        this.listenTo(this.collection, 'all x', function(){ ok(false); });
+        this.listenTo(this.model, 'all x', function(){ ok(false); }, this);
+        this.listenTo(this.collection, 'all x', function(){ ok(false); }, this);
       }
     });
 
@@ -387,19 +324,4 @@
     equal(counter, 2);
   });
 
-  test("remove", 1, function() {
-    var view = new Backbone.View;
-    document.body.appendChild(view.el);
-
-    view.delegate('click', function() { ok(false); });
-    view.listenTo(view, 'all x', function() { ok(false); });
-
-    view.remove();
-    view.$el.trigger('click');
-    view.trigger('x');
-
-    // In IE8 and below, parentNode still exists but is not document.body.
-    notEqual(view.el.parentNode, document.body);
-  });
-
 })();