Update vendors.

Former-commit-id: baf89d2c3bd7077462995bffa7f8bff1e1cf28f9

vendor/backbone/test/collection.js

@@ -82,7 +82,7 @@ $(document).ready(function() {
     equal(col.get(101), model);
 
     var Col2 = Backbone.Collection.extend({ model: MongoModel });
-    col2 = new Col2();
+    var col2 = new Col2();
     col2.push(model);
     equal(col2.get({_id: 101}), model);
     equal(col2.get(model.clone()), model);
@@ -362,7 +362,9 @@ $(document).ready(function() {
 
   test("model destroy removes from all collections", 3, function() {
     var e = new Backbone.Model({id: 5, title: 'Othello'});
-    e.sync = function(method, model, options) { options.success({}); };
+    e.sync = function(method, model, options) {
+      options.success(model, [], options);
+    };
     var colE = new Backbone.Collection([e]);
     var colF = new Backbone.Collection([e]);
     e.destroy();
@@ -417,7 +419,7 @@ $(document).ready(function() {
     equal(model.collection, collection);
   });
 
-  test("create enforces validation", 1, function() {
+  test("create with validate:true enforces validation", 1, function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
         return "fail";
@@ -427,10 +429,10 @@ $(document).ready(function() {
       model: ValidatingModel
     });
     var col = new ValidatingCollection();
-    equal(col.create({"foo":"bar"}), false);
+    equal(col.create({"foo":"bar"}, {validate:true}), false);
   });
 
-  test("a failing create runs the error callback", 1, function() {
+  test("a failing create returns model with errors", function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
         return "fail";
@@ -439,11 +441,10 @@ $(document).ready(function() {
     var ValidatingCollection = Backbone.Collection.extend({
       model: ValidatingModel
     });
-    var flag = false;
-    var callback = function(model, error) { flag = true; };
     var col = new ValidatingCollection();
-    col.create({"foo":"bar"}, { error: callback });
-    equal(flag, true);
+    var m = col.create({"foo":"bar"});
+    equal(m.validationError, 'fail');
+    equal(col.length, 1);
   });
 
   test("initialize", 1, function() {
@@ -567,7 +568,7 @@ $(document).ready(function() {
     equal(col.length, 0);
   });
 
-  test("#861, adding models to a collection which do not pass validation", function() {
+  test("#861, adding models to a collection which do not pass validation, with validate:true", function() {
       var Model = Backbone.Model.extend({
         validate: function(attrs) {
           if (attrs.id == 3) return "id can't be 3";
@@ -581,18 +582,18 @@ $(document).ready(function() {
       var collection = new Collection;
       collection.on("error", function() { ok(true); });
 
-      collection.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}]);
+      collection.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}], {validate:true});
       deepEqual(collection.pluck('id'), [1, 2, 4, 5, 6]);
   });
 
-  test("Invalid models are discarded.", 5, function() {
+  test("Invalid models are discarded with validate:true.", 5, function() {
     var collection = new Backbone.Collection;
     collection.on('test', function() { ok(true); });
     collection.model = Backbone.Model.extend({
       validate: function(attrs){ if (!attrs.valid) return 'invalid'; }
     });
     var model = new collection.model({id: 1, valid: true});
-    collection.add([model, {id: 2}]);
+    collection.add([model, {id: 2}], {validate:true});
     model.trigger('test');
     ok(collection.get(model.cid));
     ok(collection.get(1));
@@ -656,7 +657,7 @@ $(document).ready(function() {
       }
     };
     col.sync = m.sync = function( method, collection, options ){
-      options.success();
+      options.success(collection, [], options);
     };
     col.fetch(opts);
     col.create(m, opts);
@@ -674,7 +675,9 @@ $(document).ready(function() {
   test("#1447 - create with wait adds model.", 1, function() {
     var collection = new Backbone.Collection;
     var model = new Backbone.Model;
-    model.sync = function(method, model, options){ options.success(); };
+    model.sync = function(method, model, options){
+      options.success(model, [], options);
+    };
     collection.on('add', function(){ ok(true); });
     collection.create(model, {wait: true});
   });
@@ -880,6 +883,24 @@ $(document).ready(function() {
     equal(c.length, 2);
   });
 
+  test("update + merge with default values defined", function() {
+    var Model = Backbone.Model.extend({
+      defaults: {
+        key: 'value'
+      }
+    });
+    var m = new Model({id: 1});
+    var col = new Backbone.Collection([m], {model: Model});
+    equal(col.first().get('key'), 'value');
+
+    col.update({id: 1, key: 'other'});
+    equal(col.first().get('key'), 'other');
+
+    col.update({id: 1, other: 'value'});
+    equal(col.first().get('key'), 'other');
+    equal(col.length, 1);
+  });
+
   test("#1894 - Push should not trigger a sort", 0, function() {
     var Collection = Backbone.Collection.extend({
       comparator: 'id',
@@ -937,4 +958,32 @@ $(document).ready(function() {
     Backbone.ajax = ajax;
   });
 
+  test("`add` only `sort`s when necessary", 2, function () {
+    var collection = new (Backbone.Collection.extend({
+      comparator: 'a'
+    }))([{id: 1}, {id: 2}, {id: 3}]);
+    collection.on('sort', function () { ok(true); });
+    collection.add({id: 4}); // do sort, new model
+    collection.add({id: 1, a: 1}, {merge: true}); // do sort, comparator change
+    collection.add({id: 1, b: 1}, {merge: true}); // don't sort, no comparator change
+    collection.add({id: 1, a: 1}, {merge: true}); // don't sort, no comparator change
+    collection.add(collection.models); // don't sort, nothing new
+    collection.add(collection.models, {merge: true}); // don't sort
+  });
+
+  test("`add` only `sort`s when necessary with comparator function", 3, function () {
+    var collection = new (Backbone.Collection.extend({
+      comparator: function(a, b) {
+        a.get('a') > b.get('a') ? 1 : (a.get('a') < b.get('a') ? -1 : 0);
+      }
+    }))([{id: 1}, {id: 2}, {id: 3}]);
+    collection.on('sort', function () { ok(true); });
+    collection.add({id: 4}); // do sort, new model
+    collection.add({id: 1, a: 1}, {merge: true}); // do sort, model change
+    collection.add({id: 1, b: 1}, {merge: true}); // do sort, model change
+    collection.add({id: 1, a: 1}, {merge: true}); // don't sort, no model change
+    collection.add(collection.models); // don't sort, nothing new
+    collection.add(collection.models, {merge: true}); // don't sort
+  });
+
 });

vendor/backbone/test/events.js

@@ -86,30 +86,6 @@ $(document).ready(function() {
     b.trigger('change');
   });
 
-  test("listenTo with context", 1, function() {
-    var a = _.extend({}, Backbone.Events);
-    var ctx = {};
-    a.listenTo(a, 'foo', function(){ equal(this, ctx); }, ctx);
-    a.trigger('foo');
-  });
-
-  test("stopListening with context", 2, function() {
-    var a = _.extend({}, Backbone.Events);
-    var ctx = {};
-    var calledWithContext = false;
-    var calledWithoutContext = false;
-
-    a.listenTo(a, 'foo', function(){ calledWithContext = true; }, ctx);
-    a.listenTo(a, 'foo', function(){ calledWithoutContext = true; });
-
-    a.stopListening(a, 'foo', null, ctx);
-
-    a.trigger('foo');
-
-    equal(false, calledWithContext);
-    equal(true, calledWithoutContext);
-  });
-
   test("trigger all for each event", 3, function() {
     var a, b, obj = { counter: 0 };
     _.extend(obj, Backbone.Events);
@@ -384,4 +360,8 @@ $(document).ready(function() {
     Backbone.trigger('all');
   });
 
+  test("once without a callback is a noop", 0, function() {
+    _.extend({}, Backbone.Events).once('event').trigger('event');
+  });
+
 });

vendor/backbone/test/model.js

@@ -202,9 +202,9 @@ $(document).ready(function() {
     ok(changeCount == 1, "Change count should NOT have incremented.");
 
     a.validate = function(attrs) {
-      equal(attrs.foo, void 0, "don't ignore values when unsetting");
+      equal(attrs.foo, void 0, "validate:true passed while unsetting");
     };
-    a.unset('foo');
+    a.unset('foo', {validate: true});
     equal(a.get('foo'), void 0, "Foo should have changed");
     delete a.validate;
     ok(changeCount == 2, "Change count should have incremented for unset.");
@@ -213,6 +213,24 @@ $(document).ready(function() {
     equal(a.id, undefined, "Unsetting the id should remove the id property.");
   });
 
+  test("#2030 - set with failed validate, followed by another set triggers change", function () {
+    var attr = 0, main = 0, error = 0;
+    var Model = Backbone.Model.extend({
+      validate: function (attr) {
+        if (attr.x > 1) {
+          error++;
+          return "this is an error";
+        }
+      }
+    });
+    var model = new Model({x:0});
+      model.on('change:x', function () { attr++; });
+      model.on('change', function () { main++; });
+      model.set({x:2}, {validate:true});
+      model.set({x:1}, {validate:true});
+      deepEqual([attr, main, error], [1, 1, 1]);
+  });
+
   test("set triggers changes in the correct order", function() {
     var value = null;
     var model = new Backbone.Model;
@@ -223,15 +241,16 @@ $(document).ready(function() {
     equal(value, 'last');
   });
 
-  test("set falsy values in the correct order", 1, function() {
+  test("set falsy values in the correct order", 2, function() {
     var model = new Backbone.Model({result: 'result'});
     model.on('change', function() {
-      equal(model.changed.result, false);
+      equal(model.changed.result, void 0);
+      equal(model.previous('result'), false);
     });
     model.set({result: void 0}, {silent: true});
     model.set({result: null}, {silent: true});
     model.set({result: false}, {silent: true});
-    model.change();
+    model.set({result: void 0});
   });
 
   test("multiple unsets", 1, function() {
@@ -245,14 +264,12 @@ $(document).ready(function() {
     equal(i, 2, 'Unset does not fire an event for missing attributes.');
   });
 
-  test("unset and changedAttributes", 2, function() {
+  test("unset and changedAttributes", 1, function() {
     var model = new Backbone.Model({a: 1});
-    model.unset('a', {silent: true});
-    var changedAttributes = model.changedAttributes();
-    ok('a' in changedAttributes, 'changedAttributes should contain unset properties');
-
-    changedAttributes = model.changedAttributes();
-    ok('a' in changedAttributes, 'changedAttributes should contain unset properties when running changedAttributes again after an unset.');
+    model.on('change', function() {
+      ok('a' in model.changedAttributes(), 'changedAttributes should contain unset properties');
+    });
+    model.unset('a');
   });
 
   test("using a non-default id attribute.", 5, function() {
@@ -272,6 +289,21 @@ $(document).ready(function() {
     equal(model.get('name'), '');
   });
 
+  test("setting an object", 1, function() {
+    var model = new Backbone.Model({
+      custom: { foo: 1 }
+    });
+    model.on('change', function() {
+      ok(1);
+    });
+    model.set({
+      custom: { foo: 1 } // no change should be fired
+    });
+    model.set({
+      custom: { foo: 2 } // change event should be fired
+    });
+  });
+
   test("clear", 3, function() {
     var changed;
     var model = new Backbone.Model({id: 1, name : "Model"});
@@ -308,9 +340,9 @@ $(document).ready(function() {
     equal(model.get('two'), 4);
   });
 
-  test("change, hasChanged, changedAttributes, previous, previousAttributes", 12, function() {
-    var model = new Backbone.Model({name : "Tim", age : 10});
-    equal(model.changedAttributes(), false);
+  test("change, hasChanged, changedAttributes, previous, previousAttributes", 9, function() {
+    var model = new Backbone.Model({name: "Tim", age: 10});
+    deepEqual(model.changedAttributes(), false);
     model.on('change', function() {
       ok(model.hasChanged('name'), 'name changed');
       ok(!model.hasChanged('age'), 'age did not');
@@ -320,17 +352,13 @@ $(document).ready(function() {
     });
     equal(model.hasChanged(), false);
     equal(model.hasChanged(undefined), false);
-    model.set({name : 'Rob'}, {silent : true});
-    equal(model.hasChanged(), true);
-    equal(model.hasChanged(undefined), true);
-    equal(model.hasChanged('name'), true);
-    model.change();
+    model.set({name : 'Rob'});
     equal(model.get('name'), 'Rob');
   });
 
   test("changedAttributes", 3, function() {
     var model = new Backbone.Model({a: 'a', b: 'b'});
-    equal(model.changedAttributes(), false);
+    deepEqual(model.changedAttributes(), false);
     equal(model.changedAttributes({a: 'a'}), false);
     equal(model.changedAttributes({a: 'b'}).a, 'b');
   });
@@ -341,8 +369,7 @@ $(document).ready(function() {
     model.on('change', function(model, options) {
       value = options.prefix + model.get('name');
     });
-    model.set({name: 'Bob'}, {silent: true});
-    model.change({prefix: 'Mr. '});
+    model.set({name: 'Bob'}, {prefix: 'Mr. '});
     equal(value, 'Mr. Bob');
     model.set({name: 'Sue'}, {prefix: 'Ms. '});
     equal(value, 'Ms. Sue');
@@ -368,19 +395,21 @@ $(document).ready(function() {
     model.set({lastName: 'Hicks'});
   });
 
-  test("validate after save", 1, function() {
+  test("validate after save", 2, function() {
     var lastError, model = new Backbone.Model();
     model.validate = function(attrs) {
       if (attrs.admin) return "Can't change admin status.";
     };
     model.sync = function(method, model, options) {
-      options.success.call(this, {admin: true});
+      options.success.call(this, this, {admin: true}, options);
     };
-    model.save(null, {error: function(model, error) {
+    model.on('invalid', function(model, error) {
       lastError = error;
-    }});
+    });
+    model.save(null);
 
     equal(lastError, "Can't change admin status.");
+    equal(model.validationError, "Can't change admin status.");
   });
 
   test("save", 2, function() {
@@ -406,13 +435,24 @@ $(document).ready(function() {
   test("save in positional style", 1, function() {
     var model = new Backbone.Model();
     model.sync = function(method, model, options) {
-      options.success();
+      options.success(model, {}, options);
     };
     model.save('title', 'Twelfth Night');
     equal(model.get('title'), 'Twelfth Night');
   });
 
-
+  test("save with non-object success response", 2, function () {
+    var model = new Backbone.Model();
+    model.sync = function(method, model, options) {
+      options.success(model, '', options);
+      options.success(model, null, options);
+    };
+    model.save({testing:'empty'}, {
+      success: function (model) {
+        deepEqual(model.attributes, {testing:'empty'});
+      }
+    });
+  });
 
   test("fetch", 2, function() {
     doc.fetch();
@@ -442,14 +482,16 @@ $(document).ready(function() {
     model.validate = function(attrs) {
       if (attrs.admin != this.get('admin')) return "Can't change admin status.";
     };
-    model.on('error', function(model, error) {
+    model.on('invalid', function(model, error) {
       lastError = error;
     });
     var result = model.set({a: 100});
     equal(result, model);
     equal(model.get('a'), 100);
     equal(lastError, undefined);
-    result = model.set({a: 200, admin: false});
+    result = model.set({admin: true});
+    equal(model.get('admin'), true);
+    result = model.set({a: 200, admin: false}, {validate:true});
     equal(lastError, "Can't change admin status.");
     equal(result, false);
     equal(model.get('a'), 100);
@@ -467,10 +509,10 @@ $(document).ready(function() {
     model.set({name: "Two"});
     equal(model.get('name'), 'Two');
     equal(error, undefined);
-    model.unset('name');
+    model.unset('name', {validate: true});
     equal(error, true);
     equal(model.get('name'), 'Two');
-    model.clear();
+    model.clear({validate:true});
     equal(model.get('name'), 'Two');
     delete model.validate;
     model.clear();
@@ -483,21 +525,18 @@ $(document).ready(function() {
     model.validate = function(attrs) {
       if (attrs.admin) return "Can't change admin status.";
     };
-    var callback = function(model, error) {
-      lastError = error;
-    };
-    model.on('error', function(model, error) {
+    model.on('invalid', function(model, error) {
       boundError = true;
     });
-    var result = model.set({a: 100}, {error: callback});
+    var result = model.set({a: 100}, {validate:true});
     equal(result, model);
     equal(model.get('a'), 100);
-    equal(lastError, undefined);
+    equal(model.validationError, null);
     equal(boundError, undefined);
-    result = model.set({a: 200, admin: true}, {error: callback});
+    result = model.set({a: 200, admin: true}, {validate:true});
     equal(result, false);
     equal(model.get('a'), 100);
-    equal(lastError, "Can't change admin status.");
+    equal(model.validationError, "Can't change admin status.");
     equal(boundError, true);
   });
 
@@ -592,6 +631,13 @@ $(document).ready(function() {
     ok(model.get('x') === a);
   });
 
+  test("set same value does not trigger change", 0, function() {
+    var model = new Backbone.Model({x: 1});
+    model.on('change change:x', function() { ok(false); });
+    model.set({x: 1});
+    model.set({x: 1});
+  });
+
   test("unset does not fire a change for undefined attributes", 0, function() {
     var model = new Backbone.Model({x: undefined});
     model.on('change:x', function(){ ok(false); });
@@ -603,19 +649,29 @@ $(document).ready(function() {
     ok('x' in model.attributes);
   });
 
-  test("change fires change:attr", 1, function() {
+  test("hasChanged works outside of change events, and true within", 6, function() {
     var model = new Backbone.Model({x: 1});
-    model.set({x: 2}, {silent: true});
-    model.on('change:x', function(){ ok(true); });
-    model.change();
-  });
-
-  test("hasChanged is false after original values are set", 2, function() {
-    var model = new Backbone.Model({x: 1});
-    model.on('change:x', function(){ ok(false); });
+    model.on('change:x', function() {
+      ok(model.hasChanged('x'));
+      equal(model.get('x'), 1);
+    });
     model.set({x: 2}, {silent: true});
     ok(model.hasChanged());
-    model.set({x: 1}, {silent: true});
+    equal(model.hasChanged('x'), true);
+    model.set({x: 1});
+    ok(model.hasChanged());
+    equal(model.hasChanged('x'), true);
+  });
+
+  test("hasChanged gets cleared on the following set", 4, function() {
+    var model = new Backbone.Model;
+    model.set({x: 1});
+    ok(model.hasChanged());
+    model.set({x: 1});
+    ok(!model.hasChanged());
+    model.set({x: 2});
+    ok(model.hasChanged());
+    model.set({});
     ok(!model.hasChanged());
   });
 
@@ -664,7 +720,7 @@ $(document).ready(function() {
   test("#1030 - `save` with `wait` results in correct attributes if success is called during sync", 2, function() {
     var model = new Backbone.Model({x: 1, y: 2});
     model.sync = function(method, model, options) {
-      options.success();
+      options.success(model, {}, options);
     };
     model.on("change:x", function() { ok(true); });
     model.save({x: 3}, {wait: true});
@@ -691,25 +747,19 @@ $(document).ready(function() {
     model.set({x: true});
     deepEqual(events, ['change:y', 'change:x', 'change']);
     events = [];
-    model.change();
-    deepEqual(events, ['change:z', 'change']);
+    model.set({z: true});
+    deepEqual(events, []);
   });
 
   test("nested `change` only fires once", 1, function() {
     var model = new Backbone.Model();
     model.on('change', function() {
       ok(true);
-      model.change();
+      model.set({x: true});
     });
     model.set({x: true});
   });
 
-  test("no `'change'` event if no changes", 0, function() {
-    var model = new Backbone.Model();
-    model.on('change', function() { ok(false); });
-    model.change();
-  });
-
   test("nested `set` during `'change'`", 6, function() {
     var count = 0;
     var model = new Backbone.Model();
@@ -721,13 +771,13 @@ $(document).ready(function() {
           model.set({y: true});
           break;
         case 1:
-          deepEqual(this.changedAttributes(), {y: true});
-          equal(model.previous('x'), true);
+          deepEqual(this.changedAttributes(), {x: true, y: true});
+          equal(model.previous('x'), undefined);
           model.set({z: true});
           break;
         case 2:
-          deepEqual(this.changedAttributes(), {z: true});
-          equal(model.previous('y'), true);
+          deepEqual(this.changedAttributes(), {x: true, y: true, z: true});
+          equal(model.previous('y'), undefined);
           break;
         default:
           ok(false);
@@ -736,30 +786,34 @@ $(document).ready(function() {
     model.set({x: true});
   });
 
-  test("nested `'change'` with silent", 3, function() {
+  test("nested `change` with silent", 3, function() {
     var count = 0;
     var model = new Backbone.Model();
-    model.on('change:y', function() { ok(true); });
+    model.on('change:y', function() { ok(false); });
     model.on('change', function() {
       switch(count++) {
         case 0:
           deepEqual(this.changedAttributes(), {x: true});
           model.set({y: true}, {silent: true});
+          model.set({z: true});
           break;
         case 1:
-          deepEqual(this.changedAttributes(), {y: true, z: true});
+          deepEqual(this.changedAttributes(), {x: true, y: true, z: true});
+          break;
+        case 2:
+          deepEqual(this.changedAttributes(), {z: false});
           break;
         default:
           ok(false);
       }
     });
     model.set({x: true});
-    model.set({z: true});
+    model.set({z: false});
   });
 
-  test("nested `'change:attr'` with silent", 1, function() {
+  test("nested `change:attr` with silent", 0, function() {
     var model = new Backbone.Model();
-    model.on('change:y', function(){ ok(true); });
+    model.on('change:y', function(){ ok(false); });
     model.on('change', function() {
       model.set({y: true}, {silent: true});
       model.set({z: true});
@@ -777,21 +831,25 @@ $(document).ready(function() {
       equal(val, 2);
     });
     model.set({x: true});
-    model.change();
   });
 
-  test("multiple nested changes with silent", 2, function() {
+  test("multiple nested changes with silent", 1, function() {
     var changes = [];
     var model = new Backbone.Model();
     model.on('change:b', function(model, val) { changes.push(val); });
     model.on('change', function() {
       model.set({b: 1});
-      model.set({b: 2}, {silent: true});
     });
     model.set({b: 0});
     deepEqual(changes, [0, 1]);
-    model.change();
-    deepEqual(changes, [0, 1, 2, 1]);
+  });
+
+  test("basic silent change semantics", 1, function() {
+    var model = new Backbone.Model;
+    model.set({x: 1});
+    model.on('change', function(){ ok(true); });
+    model.set({x: 2}, {silent: true});
+    model.set({x: 1});
   });
 
   test("nested set multiple times", 1, function() {
@@ -828,7 +886,7 @@ $(document).ready(function() {
       }
     };
     model.sync = function(method, model, options) {
-      options.success();
+      options.success(model, {}, options);
     };
     model.save({id: 1}, opts);
     model.fetch(opts);
@@ -866,7 +924,7 @@ $(document).ready(function() {
       validate: function(){ return 'invalid'; }
     });
     var model = new Model({id: 1});
-    model.on('error', function(){ ok(true); });
+    model.on('invalid', function(){ ok(true); });
     model.save();
   });
 
@@ -885,7 +943,7 @@ $(document).ready(function() {
     var Model = Backbone.Model.extend({
       sync: function(method, model, options) {
         setTimeout(function(){
-          options.success();
+          options.success(model, {}, options);
           start();
         }, 0);
       }
@@ -895,9 +953,9 @@ $(document).ready(function() {
     .save(null, {wait: true});
   });
 
-  test("#1664 - Changing from one value, silently to another, back to original does not trigger change.", 0, function() {
+  test("#1664 - Changing from one value, silently to another, back to original triggers a change.", 1, function() {
     var model = new Backbone.Model({x:1});
-    model.on('change:x', function() { ok(false); });
+    model.on('change:x', function() { ok(true); });
     model.set({x:2},{silent:true});
     model.set({x:3},{silent:true});
     model.set({x:1});
@@ -910,15 +968,11 @@ $(document).ready(function() {
       model.set({a:'c'}, {silent:true});
       model.set({b:2}, {silent:true});
       model.unset('c', {silent:true});
-      model.set({a:'a'}, {silent:true});
-      model.set({b:1}, {silent:true});
-      model.set({c:'item'}, {silent:true});
     });
     model.on('change:a change:b change:c', function(model, val) { changes.push(val); });
     model.set({a:'a', b:1, c:'item'});
     deepEqual(changes, ['a',1,'item']);
-    model.change();
-    deepEqual(changes, ['a',1,'item']);
+    deepEqual(model.attributes, {a: 'c', b: 2});
   });
 
   test("#1791 - `attributes` is available for `parse`", function() {
@@ -929,7 +983,7 @@ $(document).ready(function() {
     expect(0);
   });
 
-  test("silent changes in last `change` event back to original does not trigger change", 2, function() {
+  test("silent changes in last `change` event back to original triggers change", 2, function() {
     var changes = [];
     var model = new Backbone.Model();
     model.on('change:a change:b change:c', function(model, val) { changes.push(val); });
@@ -938,9 +992,8 @@ $(document).ready(function() {
     });
     model.set({a:'a'});
     deepEqual(changes, ['a']);
-    model.set({a:'a'}, {silent:true});
-    model.change();
-    deepEqual(changes, ['a']);
+    model.set({a:'a'});
+    deepEqual(changes, ['a', 'a']);
   });
 
   test("#1943 change calculations should use _.isEqual", function() {
@@ -949,4 +1002,65 @@ $(document).ready(function() {
     equal(model.changedAttributes(), false);
   });
 
+  test("#1964 - final `change` event is always fired, regardless of interim changes", 1, function () {
+    var model = new Backbone.Model();
+    model.on('change:property', function() {
+      model.set('property', 'bar');
+    });
+    model.on('change', function() {
+      ok(true);
+    });
+    model.set('property', 'foo');
+  });
+
+  test("isValid", function() {
+    var model = new Backbone.Model({valid: true});
+    model.validate = function(attrs) {
+      if (!attrs.valid) return "invalid";
+    };
+    equal(model.isValid(), true);
+    equal(model.set({valid: false}, {validate:true}), false);
+    equal(model.isValid(), true);
+    model.set({valid:false});
+    equal(model.isValid(), false);
+    ok(!model.set('valid', false, {validate: true}));
+  });
+
+  test("#1179 - isValid returns true in the absence of validate.", 1, function() {
+    var model = new Backbone.Model();
+    model.validate = null;
+    ok(model.isValid());
+  });
+
+  test("#1961 - Creating a model with {validate:true} will call validate and use the error callback", function () {
+    var Model = Backbone.Model.extend({
+      validate: function (attrs) {
+        if (attrs.id === 1) return "This shouldn't happen";
+      }
+    });
+    var model = new Model({id: 1}, {validate: true});
+    equal(model.validationError, "This shouldn't happen");
+  });
+
+  test("toJSON receives attrs during save(..., {wait: true})", 1, function() {
+    var Model = Backbone.Model.extend({
+      url: '/test',
+      toJSON: function() {
+        strictEqual(this.attributes.x, 1);
+        return _.clone(this.attributes);
+      }
+    });
+    var model = new Model;
+    model.save({x: 1}, {wait: true});
+  });
+
+  test("#2034 - nested set with silent only triggers one change", 1, function() {
+    var model = new Backbone.Model();
+    model.on('change', function() {
+      model.set({b: true}, {silent: true});
+      ok(true);
+    });
+    model.set({a: true});
+  });
+
 });

vendor/backbone/test/router.js

@@ -70,6 +70,7 @@ $(document).ready(function() {
       "contacts/new":               "newContact",
       "contacts/:id":               "loadContact",
       "optional(/:item)":           "optionalItem",
+      "named/optional/(y:z)":       "namedOptional",
       "splat/*args/end":            "splat",
       "*first/complex-:part/*rest": "complex",
       ":entity?*args":              "query",
@@ -110,23 +111,27 @@ $(document).ready(function() {
       this.arg = arg != void 0 ? arg : null;
     },
 
-    splat : function(args) {
+    splat: function(args) {
       this.args = args;
     },
 
-    complex : function(first, part, rest) {
+    complex: function(first, part, rest) {
       this.first = first;
       this.part = part;
       this.rest = rest;
     },
 
-    query : function(entity, args) {
+    query: function(entity, args) {
       this.entity    = entity;
       this.queryArgs = args;
     },
 
-    anything : function(whatever) {
+    anything: function(whatever) {
       this.anything = whatever;
+    },
+
+    namedOptional: function(z) {
+      this.z = z;
     }
 
   });
@@ -502,4 +507,13 @@ $(document).ready(function() {
     strictEqual(history.getFragment('/fragment '), 'fragment');
   });
 
+  test("#1980 - Optional parameters.", 2, function() {
+    location.replace('http://example.com#named/optional/y');
+    Backbone.history.checkUrl();
+    strictEqual(router.z, undefined);
+    location.replace('http://example.com#named/optional/y123');
+    Backbone.history.checkUrl();
+    strictEqual(router.z, '123');
+  });
+
 });

vendor/backbone/test/view.js

@@ -29,22 +29,6 @@ $(document).ready(function() {
     strictEqual(view.$('a b').html(), 'test');
   });
 
-  test("make", 3, function() {
-    var div = view.make('div', {id: 'test-div'}, "one two three");
-
-    equal(div.tagName.toLowerCase(), 'div');
-    equal(div.id, 'test-div');
-    equal($(div).text(), 'one two three');
-  });
-
-  test("make can take falsy values for content", 2, function() {
-    var div = view.make('div', {id: 'test-div'}, 0);
-    equal($(div).text(), '0');
-
-    div = view.make('div', {id: 'test-div'}, '');
-    equal($(div).text(), '');
-  });
-
   test("initialize", 1, function() {
     var View = Backbone.View.extend({
       initialize: function() {