From 8e74668e3c5c973e7d68eea1d0ab49d15a894b82 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 5 Jan 2018 10:18:08 +0000 Subject: [PATCH] Update linter plus related spacing fixes --- lib/operation.js | 2 +- package.json | 2 +- test/unit/bandbool.js | 26 +-- test/unit/boolean.js | 78 +++---- test/unit/embed.js | 432 +++++++++++++++++++-------------------- test/unit/joinChannel.js | 4 +- test/unit/resize.js | 16 +- 7 files changed, 280 insertions(+), 280 deletions(-) diff --git a/lib/operation.js b/lib/operation.js index 692b68eb..85f96594 100644 --- a/lib/operation.js +++ b/lib/operation.js @@ -332,7 +332,7 @@ function convolve (kernel) { !is.integer(kernel.width) || !is.integer(kernel.height) || !is.inRange(kernel.width, 3, 1001) || !is.inRange(kernel.height, 3, 1001) || kernel.height * kernel.width !== kernel.kernel.length - ) { + ) { // must pass in a kernel throw new Error('Invalid convolution kernel'); } diff --git a/package.json b/package.json index df488c77..f411246f 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "mocha": "^4.0.1", "nyc": "^11.4.0", "rimraf": "^2.6.1", - "semistandard": "^11.0.0", + "semistandard": "^12.0.0", "unzip": "^0.1.11" }, "license": "Apache-2.0", diff --git a/test/unit/bandbool.js b/test/unit/bandbool.js index e6ea9d66..dfc98cde 100644 --- a/test/unit/bandbool.js +++ b/test/unit/bandbool.js @@ -10,20 +10,20 @@ describe('Bandbool per-channel boolean operations', function () { sharp.bool.or, sharp.bool.eor ] - .forEach(function (op) { - it(op + ' operation', function (done) { - sharp(fixtures.inputPngBooleanNoAlpha) - .bandbool(op) - .toColourspace('b-w') - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(1, info.channels); - fixtures.assertSimilar(fixtures.expected('bandbool_' + op + '_result.png'), data, done); - }); + .forEach(function (op) { + it(op + ' operation', function (done) { + sharp(fixtures.inputPngBooleanNoAlpha) + .bandbool(op) + .toColourspace('b-w') + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(1, info.channels); + fixtures.assertSimilar(fixtures.expected('bandbool_' + op + '_result.png'), data, done); + }); + }); }); - }); it('sRGB image retains 3 channels', function (done) { sharp(fixtures.inputJpg) diff --git a/test/unit/boolean.js b/test/unit/boolean.js index 98a4570e..98680c1a 100644 --- a/test/unit/boolean.js +++ b/test/unit/boolean.js @@ -14,48 +14,48 @@ describe('Boolean operation between two images', function () { sharp.bool.or, sharp.bool.eor ] - .forEach(function (op) { - it(op + ' operation, file', function (done) { - sharp(fixtures.inputJpg) - .resize(320, 240) - .boolean(fixtures.inputJpgBooleanTest, op) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(320, info.width); - assert.strictEqual(240, info.height); - fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); - }); - }); + .forEach(function (op) { + it(op + ' operation, file', function (done) { + sharp(fixtures.inputJpg) + .resize(320, 240) + .boolean(fixtures.inputJpgBooleanTest, op) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(320, info.width); + assert.strictEqual(240, info.height); + fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); + }); + }); - it(op + ' operation, buffer', function (done) { - sharp(fixtures.inputJpg) - .resize(320, 240) - .boolean(inputJpgBooleanTestBuffer, op) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(320, info.width); - assert.strictEqual(240, info.height); - fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); - }); - }); + it(op + ' operation, buffer', function (done) { + sharp(fixtures.inputJpg) + .resize(320, 240) + .boolean(inputJpgBooleanTestBuffer, op) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(320, info.width); + assert.strictEqual(240, info.height); + fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); + }); + }); - it(op + ' operation, raw', function (done) { - sharp(fixtures.inputJpgBooleanTest) - .raw() - .toBuffer(function (err, data, info) { - if (err) throw err; - sharp(fixtures.inputJpg) - .resize(320, 240) - .boolean(data, op, { raw: info }) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(320, info.width); - assert.strictEqual(240, info.height); - fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); - }); - }); + it(op + ' operation, raw', function (done) { + sharp(fixtures.inputJpgBooleanTest) + .raw() + .toBuffer(function (err, data, info) { + if (err) throw err; + sharp(fixtures.inputJpg) + .resize(320, 240) + .boolean(data, op, { raw: info }) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(320, info.width); + assert.strictEqual(240, info.height); + fixtures.assertSimilar(fixtures.expected('boolean_' + op + '_result.jpg'), data, done); + }); + }); + }); }); - }); it('Invalid operation', function () { assert.throws(function () { diff --git a/test/unit/embed.js b/test/unit/embed.js index 8c2ce2b3..e625db37 100644 --- a/test/unit/embed.js +++ b/test/unit/embed.js @@ -169,289 +169,289 @@ describe('Embed', function () { it('Embed gravity horizontal northwest', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.northwest) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a1-nw.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.northwest) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a1-nw.png'), data, done); + }); }); it('Embed gravity horizontal north', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.north) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a2-n.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.north) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a2-n.png'), data, done); + }); }); it('Embed gravity horizontal northeast', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.northeast) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a3-ne.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.northeast) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a3-ne.png'), data, done); + }); }); it('Embed gravity horizontal east', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.east) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a4-e.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.east) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a4-e.png'), data, done); + }); }); it('Embed gravity horizontal southeast', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.southeast) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a5-se.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.southeast) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a5-se.png'), data, done); + }); }); it('Embed gravity horizontal south', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.south) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a6-s.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.south) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a6-s.png'), data, done); + }); }); it('Embed gravity horizontal southwest', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.southwest) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a7-sw.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.southwest) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a7-sw.png'), data, done); + }); }); it('Embed gravity horizontal west', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.west) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a8-w.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.west) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a8-w.png'), data, done); + }); }); it('Embed gravity horizontal center', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 100) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.center) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(100, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a9-c.png'), data, done); - }); + .resize(200, 100) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.center) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(100, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/a9-c.png'), data, done); + }); }); it('Embed gravity vertical northwest', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.northwest) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/1-nw.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.northwest) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/1-nw.png'), data, done); + }); }); it('Embed gravity vertical north', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.north) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/2-n.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.north) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/2-n.png'), data, done); + }); }); it('Embed gravity vertical northeast', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.northeast) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/3-ne.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.northeast) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/3-ne.png'), data, done); + }); }); it('Embed gravity vertical east', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.east) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/4-e.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.east) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/4-e.png'), data, done); + }); }); it('Embed gravity vertical southeast', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.southeast) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/5-se.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.southeast) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/5-se.png'), data, done); + }); }); it('Embed gravity vertical south', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.south) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/6-s.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.south) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/6-s.png'), data, done); + }); }); it('Embed gravity vertical southwest', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.southwest) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/7-sw.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.southwest) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/7-sw.png'), data, done); + }); }); it('Embed gravity vertical west', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.west) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/8-w.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.west) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/8-w.png'), data, done); + }); }); it('Embed gravity vertical center', function (done) { sharp(fixtures.inputPngEmbed) - .resize(200, 200) - .background({r: 0, g: 0, b: 0, alpha: 0}) - .embed(sharp.gravity.center) - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(true, data.length > 0); - assert.strictEqual('png', info.format); - assert.strictEqual(200, info.width); - assert.strictEqual(200, info.height); - assert.strictEqual(4, info.channels); - fixtures.assertSimilar(fixtures.expected('./embedgravitybird/9-c.png'), data, done); - }); + .resize(200, 200) + .background({r: 0, g: 0, b: 0, alpha: 0}) + .embed(sharp.gravity.center) + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(true, data.length > 0); + assert.strictEqual('png', info.format); + assert.strictEqual(200, info.width); + assert.strictEqual(200, info.height); + assert.strictEqual(4, info.channels); + fixtures.assertSimilar(fixtures.expected('./embedgravitybird/9-c.png'), data, done); + }); }); }); diff --git a/test/unit/joinChannel.js b/test/unit/joinChannel.js index dd993d2c..ec3c3c23 100644 --- a/test/unit/joinChannel.js +++ b/test/unit/joinChannel.js @@ -11,7 +11,7 @@ describe('Image channel insertion', function () { sharp(fixtures.inputPng) // gray -> red .resize(320, 240) .joinChannel(fixtures.inputPngTestJoinChannel) // new green channel - .joinChannel(fixtures.inputPngStripesH) // new blue channel + .joinChannel(fixtures.inputPngStripesH) // new blue channel .toBuffer(function (err, data, info) { if (err) throw err; assert.strictEqual(320, info.width); @@ -25,7 +25,7 @@ describe('Image channel insertion', function () { sharp(fixtures.inputPng) // gray -> red .resize(320, 240) .joinChannel(fs.readFileSync(fixtures.inputPngTestJoinChannel)) // new green channel - .joinChannel(fs.readFileSync(fixtures.inputPngStripesH)) // new blue channel + .joinChannel(fs.readFileSync(fixtures.inputPngStripesH)) // new blue channel .toBuffer(function (err, data, info) { if (err) throw err; assert.strictEqual(320, info.width); diff --git a/test/unit/resize.js b/test/unit/resize.js index fed5dc4b..179ea468 100644 --- a/test/unit/resize.js +++ b/test/unit/resize.js @@ -436,14 +436,14 @@ describe('Resize dimensions', function () { it('fastShrinkOnLoad: true (default) might result in shifted image', function (done) { return sharp(fixtures.inputJpgCenteredImage) - .resize(9, 8) - .png() - .toBuffer(function (err, data, info) { - if (err) throw err; - assert.strictEqual(9, info.width); - assert.strictEqual(8, info.height); - fixtures.assertSimilar(fixtures.expected('fast-shrink-on-load-true.png'), data, done); - }); + .resize(9, 8) + .png() + .toBuffer(function (err, data, info) { + if (err) throw err; + assert.strictEqual(9, info.width); + assert.strictEqual(8, info.height); + fixtures.assertSimilar(fixtures.expected('fast-shrink-on-load-true.png'), data, done); + }); }); [