Support promise for TestDataBuilder.prototype.buildTo

Author: taoyuan

lib/test-data-builder.js

@@ -1,5 +1,5 @@
-var extend = require('util')._extend;
-var async = require('async');
+const extend = require('util')._extend;
+const Promise = require('bluebird');
 
 module.exports = exports = TestDataBuilder;
 
@@ -46,7 +46,7 @@ function TestDataBuilder() {
  *   for required properties not listed.
  * @return TestDataBuilder (fluent interface)
  */
-TestDataBuilder.prototype.define = function(name, Model, properties) {
+TestDataBuilder.prototype.define = function (name, Model, properties) {
   this._definitions.push({
     name: name,
     model: Model,
@@ -61,7 +61,7 @@ TestDataBuilder.prototype.define = function(name, Model, properties) {
  * is the name passed to `define()` and {property} is the name of
  * the property to use.
  */
-TestDataBuilder.ref = function(path) {
+TestDataBuilder.ref = function (path) {
   return new Reference(path);
 };
 
@@ -70,36 +70,31 @@ TestDataBuilder.ref = function(path) {
  * the supplied context object.
  * @param {Object.<string, Object>} context The context to object to populate.
  * @param {function(Error)} callback Callback.
+ * @return {Promise}
  */
-TestDataBuilder.prototype.buildTo = function(context, callback) {
+TestDataBuilder.prototype.buildTo = function (context, callback) {
   this._context = context;
-  async.eachSeries(
-    this._definitions,
-    this._buildObject.bind(this),
-    callback);
+  return Promise.mapSeries(this._definitions, this._buildObject.bind(this)).nodeify(callback);
 };
 
-TestDataBuilder.prototype._buildObject = function(definition, callback) {
+TestDataBuilder.prototype._buildObject = function (definition, callback) {
   var defaultValues = this._gatherDefaultPropertyValues(definition.model);
   var values = extend(defaultValues, definition.properties || {});
   var resolvedValues = this._resolveValues(values);
-
-  definition.model.create(resolvedValues, function(err, result) {
-    if (err) {
-      console.error(
-        'Cannot build object %j - %s\nDetails: %j',
-        definition,
-        err.message,
-        err.details);
-    } else {
-      this._context[definition.name] = result;
-    }
-
-    callback(err);
-  }.bind(this));
+  var that = this;
+
+  return Promise.resolve(definition.model.create(resolvedValues)).then(function (result) {
+    that._context[definition.name] = result;
+  }).catch(function (err) {
+    console.error(
+      'Cannot build object %j - %s\nDetails: %j',
+      definition,
+      err.message,
+      err.details);
+  }).nodeify(callback);
 };
 
-TestDataBuilder.prototype._resolveValues = function(values) {
+TestDataBuilder.prototype._resolveValues = function (values) {
   var result = {};
   for (var key in values) {
     var val = values[key];
@@ -112,7 +107,7 @@ TestDataBuilder.prototype._resolveValues = function(values) {
 };
 
 var valueCounter = 0;
-TestDataBuilder.prototype._gatherDefaultPropertyValues = function(Model) {
+TestDataBuilder.prototype._gatherDefaultPropertyValues = function (Model) {
   var result = {};
   Model.forEachProperty(function createDefaultPropertyValue(name) {
     var prop = Model.definition.properties[name];
@@ -163,11 +158,11 @@ function Reference(path) {
   this._path = path;
 }
 
-Reference.prototype.resolveFromContext = function(context) {
+Reference.prototype.resolveFromContext = function (context) {
   var elements = this._path.split('.');
 
   var result = elements.reduce(
-    function(obj, prop) {
+    function (obj, prop) {
       return obj[prop];
     },
     context

package.json

@@ -12,7 +12,7 @@
   },
   "author": "Ritchie Martori",
   "dependencies": {
-    "async": "^2.0.1",
+    "bluebird": "^3.4.6",
     "chai": "^3.5.0",
     "supertest": "^2.0.0"
   },