updated tests exercising fix for issue 931

Automattic · Jun 15, 2012 · 42b9ee0 · 42b9ee0
1 parent 654f5d4
commit 42b9ee0
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/test/model.findAndUpdateOne.test.js b/test/model.findAndUpdateOne.test.js
@@ -342,6 +342,26 @@ module.exports = {
     }
   },
 
+  'findOneAndUpdate executes when a callback is passed to a succeeding function': function() {
+    var db = start()
+      , M = db.model(modelname, collection + random())
+      , pending = 6
+
+    M.findOneAndUpdate({ name: 'aaron' }, { $set: { name: 'Aaron'}}, { new: false }).exec(done);
+    M.findOneAndUpdate({ name: 'aaron' }, { $set: { name: 'Aaron'}}).exec(done);
+    M.where().findOneAndUpdate({ name: 'aaron' }, { $set: { name: 'Aaron'}}, { new: false }).exec(done);
+    M.where().findOneAndUpdate({ name: 'aaron' }, { $set: { name: 'Aaron'}}).exec(done);
+    M.where().findOneAndUpdate({ $set: { name: 'Aaron'}}).exec(done);
+    M.where('name', 'aaron').findOneAndUpdate({ $set: { name: 'Aaron'}}).exec(done);
+
+    function done (err, doc) {
+      should.strictEqual(null, err);
+      should.strictEqual(null, doc); // not an upsert, no previously existing doc
+      if (--pending) return;
+      db.close();
+    }
+  },
+
   'Model.findOneAndUpdate(callback) throws': function () {
     var db = start()
       , M = db.model(modelname, collection)