From d2a2654ace8740b92040bcf9d5c0ee336b9dfff8 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 19 May 2015 18:55:49 +0100 Subject: [PATCH] Replace use of 'finally' in failing tests --- test/unit/normalize.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/test/unit/normalize.js b/test/unit/normalize.js index 43eb00d0..2f144a68 100755 --- a/test/unit/normalize.js +++ b/test/unit/normalize.js @@ -29,7 +29,7 @@ describe('Normalization', function () { } assert.strictEqual(0, min); assert.strictEqual(255, max); - return done(); + done(); }); }); @@ -48,7 +48,7 @@ describe('Normalization', function () { } assert.strictEqual(0, min); assert.strictEqual(255, max); - return done(); + done(); }); }); @@ -64,37 +64,37 @@ describe('Normalization', function () { } assert.strictEqual(0, min); assert.strictEqual(255, max); - return done(); + done(); }); }); it('keeps an existing alpha channel', function (done) { sharp(fixtures.inputPngWithTransparency) .normalize() - .toBuffer(function (err, data, info) { - sharp(data) - .metadata() - .then(function (metadata) { - assert.strictEqual(4, metadata.channels); - assert.strictEqual(true, metadata.hasAlpha); - assert.strictEqual('srgb', metadata.space); - }) - .finally(done); + .toBuffer(function (err, data) { + if (err) return done(err); + sharp(data).metadata(function(err, metadata) { + if (err) return done(err); + assert.strictEqual(4, metadata.channels); + assert.strictEqual(true, metadata.hasAlpha); + assert.strictEqual('srgb', metadata.space); + done(); + }); }); }); it('keeps the alpha channel of greyscale images intact', function (done) { sharp(fixtures.inputPngWithGreyAlpha) .normalize() - .toBuffer(function (err, data, info) { - sharp(data) - .metadata() - .then(function (metadata) { - assert.strictEqual(true, metadata.hasAlpha); - assert.strictEqual(4, metadata.channels); - assert.strictEqual('srgb', metadata.space); - }) - .finally(done); + .toBuffer(function (err, data) { + if (err) return done(err); + sharp(data).metadata(function(err, metadata) { + if (err) return done(err); + assert.strictEqual(true, metadata.hasAlpha); + assert.strictEqual(4, metadata.channels); + assert.strictEqual('srgb', metadata.space); + done(); + }); }); });