Fix jashkenas#1057 - Save with wait validates model.

bewest · Mar 18, 2012 · 6948b59 · 6948b59
1 parent 01fb414
commit 6948b59
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -337,7 +337,10 @@
       }
 
       options = options ? _.clone(options) : {};
-      if (options.wait) current = _.clone(this.attributes);
+      if (options.wait) {
+        if (!this._validate(attrs, options)) return false;
+        current = _.clone(this.attributes);
+      }
       var silentOptions = _.extend({}, options, {silent: true});
       if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
         return false;

diff --git a/test/model.js b/test/model.js
@@ -615,6 +615,12 @@ $(document).ready(function() {
     equal(changed, 1);
   });
 
+  test("save with wait validates attributes", 1, function() {
+    var model = new Backbone.Model();
+    model.validate = function() { ok(true); };
+    model.save({x: 1}, {wait: true});
+  });
+
   test("nested `set` during `'change:attr'`", function() {
     var events = [];
     var model = new Backbone.Model();