verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1560 from strongloop/fix/forgotten-bluebird-reference 

Don't load Bluebird for createPromiseCallback
This commit is contained in:
Miroslav Bajtoš 2015-08-04 11:16:33 +02:00
parent aa5c9e3628 98784e2b4b
commit 7ff771c6bf
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/utils.js
View File

@ -1,6 +1,5 @@
exports.createPromiseCallback = createPromiseCallback; exports.createPromiseCallback = createPromiseCallback;
var Promise = global.Promise = require('bluebird');
function createPromiseCallback() { function createPromiseCallback() {
var cb; var cb;
@ -12,7 +11,7 @@ function createPromiseCallback() {
return cb; return cb;
} }
var promise = new Promise(function(resolve, reject) { var promise = new global.Promise(function(resolve, reject) {
cb = function(err, data) { cb = function(err, data) {
if (err) return reject(err); if (err) return reject(err);
return resolve(data); return resolve(data);

4
test/support.js
View File

@ -47,3 +47,7 @@ assert.isFunc = function(obj, name) {
assert(obj, 'cannot assert function ' + name + ' on object that doesnt exist'); assert(obj, 'cannot assert function ' + name + ' on object that doesnt exist');
assert(typeof obj[name] === 'function', name + ' is not a function'); assert(typeof obj[name] === 'function', name + ' is not a function');
}; };
if (!('Promise' in global)) {
global.Promise = require('bluebird');
}