From 11d9410229fabec931dbed088c578e16593cef8b Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Fri, 26 May 2017 16:37:31 -0400 Subject: [PATCH] fix test and image normalize test --- src/controllers/accounts/edit.js | 2 +- src/image.js | 18 ++++++++++-------- test/files/normalise.jpg | Bin 0 -> 5349 bytes test/image.js | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 test/files/normalise.jpg create mode 100644 test/image.js diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index 9fb9f7a501..cae91cf9d7 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -117,7 +117,7 @@ function getUserData(req, next, callback) { function (data, next) { userData = data; if (!userData) { - return callback(); + return callback(null, null); } db.getObjectField('user:' + userData.uid, 'password', next); }, diff --git a/src/image.js b/src/image.js index 1609993731..9377757cf3 100644 --- a/src/image.js +++ b/src/image.js @@ -88,14 +88,16 @@ image.normalise = function (path, extension, callback) { callback(err, path + '.png'); }); } else { - new Jimp(path, function (err, image) { - if (err) { - return callback(err); - } - image.write(path + '.png', function (err) { - callback(err, path + '.png'); - }); - }); + async.waterfall([ + function (next) { + new Jimp(path, next); + }, + function (image, next) { + image.write(path + '.png', function (err) { + next(err, path + '.png'); + }); + }, + ], callback); } }; diff --git a/test/files/normalise.jpg b/test/files/normalise.jpg new file mode 100644 index 0000000000000000000000000000000000000000..013a8d0cb22ae11d99cf56473d9739d079165955 GIT binary patch literal 5349 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