Merge branch '2.2' of github.com:mongodb/node-mongodb-native into 2.2

Author: christkv

lib/collection.js

@@ -916,7 +916,7 @@ define.classMethod('updateOne', {callback: true, promise:true});
  * @param {Collection~updateWriteOpCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
-Collection.prototype.replaceOne = function(filter, update, options, callback) {
+Collection.prototype.replaceOne = function(filter, doc, options, callback) {
   var self = this;
   if(typeof options == 'function') callback = options, options = {};
   options = shallowClone(options)
@@ -928,30 +928,30 @@ Collection.prototype.replaceOne = function(filter, update, options, callback) {
   }
 
   // Execute using callback
-  if(typeof callback == 'function') return replaceOne(self, filter, update, options, callback);
+  if(typeof callback == 'function') return replaceOne(self, filter, doc, options, callback);
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
-    replaceOne(self, filter, update, options, function(err, r) {
+    replaceOne(self, filter, doc, options, function(err, r) {
       if(err) return reject(err);
       resolve(r);
     });
   });
 }
 
-var replaceOne = function(self, filter, update, options, callback) {
+var replaceOne = function(self, filter, doc, options, callback) {
   // Set single document update
   options.multi = false;
   // Execute update
-  updateDocuments(self, filter, update, options, function(err, r) {
+  updateDocuments(self, filter, doc, options, function(err, r) {
     if(callback == null) return;
     if(err && callback) return callback(err);
     if(r == null) return callback(null, {result: {ok:1}});
     r.matchedCount = r.result.n;
     r.modifiedCount = r.result.nModified != null ? r.result.nModified : r.result.n;
     r.upsertedId = Array.isArray(r.result.upserted) && r.result.upserted.length > 0 ? r.result.upserted[0] : null;
     r.upsertedCount = Array.isArray(r.result.upserted) && r.result.upserted.length ? r.result.upserted.length : 0;
-    r.ops = [update];
+    r.ops = [doc];
     if(callback) callback(null, r);
   });
 }

lib/cursor.js

@@ -979,7 +979,7 @@ define.classMethod('close', {callback: true, promise:true});
  * Map all documents using the provided function
  * @method
  * @param {function} [transform] The mapping transformation method.
- * @return {null}
+ * @return {Cursor}
  */
 Cursor.prototype.map = function(transform) {
   this.cursorState.transforms = { doc: transform };

lib/db.js

@@ -1450,9 +1450,10 @@ var authenticate = function(self, username, password, options, callback) {
 
   // the default db to authenticate against is 'self'
   // if authententicate is called from a retry context, it may be another one, like admin
-  var authdb = options.authdb ? options.authdb : options.dbName;
+  var authdb = options.dbName ? options.dbName : self.databaseName;
+  authdb = self.authSource ? self.authSource : authdb;
+  authdb = options.authdb ? options.authdb : authdb;
   authdb = options.authSource ? options.authSource : authdb;
-  authdb = authdb ? authdb : self.databaseName;
 
   // Callback
   var _callback = function(err, result) {