Fix #2446 save should always set with validate: true by default

jashkenas · Mar 29, 2013 · 8e7208e · philfreo · Mar 29, 2013 · caseywebdev
1 parent 0e7ac5a
commit 8e7208e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/backbone.js b/backbone.js
@@ -453,11 +453,11 @@
         (attrs = {})[key] = val;
       }
 
-      // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`.
-      if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false;
-
       options = _.extend({validate: true}, options);
 
+      // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`.
+      if (attrs && !options.wait && !this.set(attrs, options)) return false;
+
       // Do not persist invalid models.
       if (!this._validate(attrs, options)) return false;
 

diff --git a/test/model.js b/test/model.js
@@ -705,6 +705,13 @@ $(document).ready(function() {
     ok(this.syncArgs.model === model);
   });
 
+  test("save without `wait` doesn't set invalid attributes", function () {
+    var model = new Backbone.Model();
+    model.validate = function () { return 1; }
+    model.save({a: 1});
+    equal(model.get('a'), void 0);
+  });
+
   test("`hasChanged` for falsey keys", 2, function() {
     var model = new Backbone.Model();
     model.set({x: true}, {silent: true});