From ad6097fce8db478eecdb781ebcb8bf054349cb83 Mon Sep 17 00:00:00 2001 From: Aaron Heckmann Date: Mon, 19 Sep 2022 22:03:20 -0700 Subject: [PATCH] tests; report when no matching tests found --- test/densityGm.js | 9 ++++----- test/densityIm.js | 20 +++++++------------- test/despeckle.js | 12 +++++------- test/dispose.js | 14 +++++++++----- test/dither.js | 7 ++++--- test/edge.js | 8 ++++---- test/ellipse.js | 8 ++++---- test/emboss.js | 8 ++++---- test/enhance.js | 8 ++++---- test/equalize.js | 8 ++++---- test/extent.js | 7 ++++--- test/flatten.js | 10 ++++++---- test/flip.js | 8 ++++---- test/flop.js | 8 ++++---- test/fromBuffer.js | 9 +++++---- test/gamma.js | 8 ++++---- test/getterColor.js | 7 ++++--- test/getterFormatGIF.js | 7 ++++--- test/getterIdentify.js | 17 +++++++++++------ test/getterIptc.js | 7 ++++--- test/getterMultipleIptc.js | 7 ++++--- test/getterSize.js | 16 ++++++++++------ test/gh-17.js | 8 ++++---- test/gifFrame.js | 10 +++++----- test/gifFrameIdentify.js | 8 ++++---- test/gifFrameStream.js | 13 +++++++------ test/gravity.js | 7 ++++--- test/implode.js | 8 ++++---- test/index.js | 7 +++++-- test/inputIs.js | 12 ++++++------ test/interlace.js | 8 ++++---- test/label.js | 8 ++++---- test/limit.js | 8 ++++---- test/line.js | 8 ++++---- test/lower.js | 8 ++++---- test/magnify.js | 8 ++++---- test/median.js | 8 ++++---- test/minify.js | 8 ++++---- test/minifyIM.js | 9 +++++---- test/modulate.js | 8 ++++---- test/monochrome.js | 8 ++++---- test/montage.js | 20 ++++++++++++-------- test/morph-more.js | 8 ++++++-- test/morph.js | 9 ++++----- test/negative.js | 8 ++++---- test/new.js | 8 ++++---- test/newImage.js | 10 ++++++---- test/noise1.js | 8 ++++---- test/noise2.js | 9 +++++---- test/options.js | 15 ++++++++------- test/paint.js | 8 ++++---- test/polygon.js | 8 ++++---- test/polyline.js | 8 ++++---- test/quality.js | 8 ++++---- test/raise.js | 8 ++++---- test/rectangle.js | 8 ++++---- test/region.js | 8 ++++---- test/repagePlus.js | 7 ++++--- test/resample.js | 8 ++++---- test/resize.js | 8 ++++---- test/resizeAndAutoOrientFromBuffer.js | 9 +++++---- test/resizeBuffer.js | 9 +++++---- test/resizeWrong.js | 7 +++---- test/roll.js | 8 ++++---- test/rotate.js | 10 +++++----- test/scale.js | 8 ++++---- test/selectFrame.js | 7 ++++--- test/sepia.js | 8 ++++---- test/setFormat.js | 8 ++++---- test/sharpen.js | 8 ++++---- test/solarize.js | 8 ++++---- test/spread.js | 8 ++++---- test/streamIn.js | 15 ++++++++------- test/streamInGetter.js | 11 ++++++----- test/streamInOut.js | 10 ++++++---- test/streamOut.js | 10 ++++++---- test/streamOutFormat.js | 22 +++++++--------------- test/strip.js | 8 ++++---- test/subclass.js | 10 ++++++---- test/swirl.js | 8 ++++---- test/text.js | 8 ++++---- test/thumb.js | 8 ++++---- test/thumbnail.js | 8 ++++---- test/timeout.js | 14 ++++++++------ test/webp.js | 20 +++++++++++--------- 85 files changed, 418 insertions(+), 381 deletions(-) diff --git a/test/densityGm.js b/test/densityGm.js index 9d0af8a7..89c651bb 100644 --- a/test/densityGm.js +++ b/test/densityGm.js @@ -2,6 +2,8 @@ const assert = require('assert') const path = require('path'); module.exports = function (gm, dir, finish, GM) { + const isImageMagickTest = !!gm._options.imageMagick; + var NUMBER = 100; var NUMBER2 = 200; @@ -12,11 +14,8 @@ module.exports = function (gm, dir, finish, GM) { assert.equal('-density', gArgs[1]); assert.equal(NUMBER + 'x' + NUMBER2, gArgs[2]); - if (gm._options.imageMagick) - return finish(); - - if (!GM.integration) - return finish(); + if (isImageMagickTest) return finish(); + if (!GM.integration) return finish(); const destPath = path.join(dir, 'density.png'); g.write(destPath, function density (err) { diff --git a/test/densityIm.js b/test/densityIm.js index 82dd0624..27e58a6b 100644 --- a/test/densityIm.js +++ b/test/densityIm.js @@ -1,28 +1,22 @@ - -var assert = require('assert'); +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { - 'use strict'; + const isImageMagickTest = !!gm._options.imageMagick; - // a magic number var NUMBER = 100; - - // image magic version var im = gm.options({imageMagick: true}).density(NUMBER); var imArgs = im.args(); - assert.equal('convert', imArgs[0]); assert.equal('-density', imArgs[1]); assert.equal(NUMBER, imArgs[2]); - if (gm._options.imageMagick) - return finish(); - - if (!GM.integration) - return finish(); + if (isImageMagickTest) return finish(); + if (!GM.integration) return finish(); - im.write(dir + '/density.png', function density (err) { + const destPath = path.join(dir, 'density.png'); + im.write(destPath, function density (err) { finish(err); }); }; diff --git a/test/despeckle.js b/test/despeckle.js index e3e9dec3..0d5d67ce 100644 --- a/test/despeckle.js +++ b/test/despeckle.js @@ -1,10 +1,8 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { - - var m = gm - .despeckle(); + var m = gm.despeckle(); var args = m.args(); assert.equal('convert', args[0]); @@ -13,8 +11,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/despeckle.png', function despeckle (err) { + const destPath = path.join(dir, 'despeckle.png'); + m.write(destPath, function despeckle (err) { finish(err); }); } diff --git a/test/dispose.js b/test/dispose.js index b2187649..ec7cc726 100644 --- a/test/dispose.js +++ b/test/dispose.js @@ -1,4 +1,5 @@ -var assert = require('assert'); +const assert = require('assert') +const path = require('path'); module.exports = function (img, dir, finish, gm) { var EventEmitter = require('events').EventEmitter; @@ -24,8 +25,11 @@ module.exports = function (img, dir, finish, gm) { return finish(); } - gm(dir + '/photo.JPG').options({ disposers: [ disposer ]}) - .thumb(1000, 1000, dir + '/dispose.png', function (err) { + const photoPath = path.join(dir, 'photo.JPG'); + const disposePath = path.join(dir, 'dispose.png'); + + gm(photoPath).options({ disposers: [ disposer ]}) + .thumb(1000, 1000, disposePath, function (err) { assert.ok(err, "Expecting a disposed error"); }); @@ -34,8 +38,8 @@ module.exports = function (img, dir, finish, gm) { noDispose(); function noDispose() { - gm(dir + '/photo.JPG').options({ disposers: [ disposer ]}) - .thumb(1000, 1000, dir + '/dispose.png', function (err) { + gm(photoPath).options({ disposers: [ disposer ]}) + .thumb(1000, 1000, disposePath, function (err) { finish(err); }); emitter.emit('disposeOK'); diff --git a/test/dither.js b/test/dither.js index 97ad31ff..ca53a179 100644 --- a/test/dither.js +++ b/test/dither.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { if (gm._options.imageMagick) @@ -15,7 +15,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - g.write(dir + '/dither.png', function dither (err) { + const destPath = path.join(dir, 'dither.png'); + g.write(destPath, function dither (err) { finish(err); }); } diff --git a/test/edge.js b/test/edge.js index 1c642000..22f04ebf 100644 --- a/test/edge.js +++ b/test/edge.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/edge.png', function edge (err) { + const destPath = path.join(dir, 'edge.png'); + m.write(destPath, function edge (err) { finish(err); }); } diff --git a/test/ellipse.js b/test/ellipse.js index 8f5a34b7..60bd6d15 100644 --- a/test/ellipse.js +++ b/test/ellipse.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -22,8 +22,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/ellipse.png', function ellipse (err) { + const destPath = path.join(dir, 'ellipse.png'); + m.write(destPath, function ellipse (err) { finish(err); }); } diff --git a/test/emboss.js b/test/emboss.js index 287d652a..1a831afd 100644 --- a/test/emboss.js +++ b/test/emboss.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/emboss.png', function emboss (err) { + const destPath = path.join(dir, 'emboss.png'); + m.write(destPath, function emboss (err) { finish(err); }); } diff --git a/test/enhance.js b/test/enhance.js index 2e3d8845..3f9a285e 100644 --- a/test/enhance.js +++ b/test/enhance.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/enhance.png', function enhance (err) { + const destPath = path.join(dir, 'enhance.png'); + m.write(destPath, function enhance (err) { finish(err); }); } diff --git a/test/equalize.js b/test/equalize.js index f127cc74..e8c506c3 100644 --- a/test/equalize.js +++ b/test/equalize.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/equalize.png', function equalize (err) { + const destPath = path.join(dir, 'equalize.png'); + m.write(destPath, function equalize (err) { finish(err); }); } diff --git a/test/extent.js b/test/extent.js index 70ef12a9..2c8a0daa 100644 --- a/test/extent.js +++ b/test/extent.js @@ -1,4 +1,5 @@ -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -16,8 +17,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/extent.png', function resize (err) { + const destPath = path.join(dir, 'extent.png'); + m.write(destPath, function resize (err) { finish(err); }); } diff --git a/test/flatten.js b/test/flatten.js index de5c5332..d093bd19 100644 --- a/test/flatten.js +++ b/test/flatten.js @@ -1,4 +1,5 @@ -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (img, dir, finish, gm) { // graphicsmagick considers PSD broken @@ -7,7 +8,8 @@ module.exports = function (img, dir, finish, gm) { return finish(); } - var m = gm(dir + '/layers.psd') + const layersPath = path.join(dir, 'layers.psd'); + var m = gm(layersPath) .options({ imageMagick: true }) .flatten(); @@ -18,8 +20,8 @@ module.exports = function (img, dir, finish, gm) { if (!gm.integration) return finish(); - m - .write(dir + '/unlayered.jpg', function (err) { + const destPath = path.join(dir, 'unlayered.jpg'); + m.write(destPath, function (err) { finish(err); }); } diff --git a/test/flip.js b/test/flip.js index d480d555..f440132a 100644 --- a/test/flip.js +++ b/test/flip.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/flip.png', function flip (err) { + const destPath = path.join(dir, 'flip.png'); + m.write(destPath, function flip (err) { finish(err); }); } diff --git a/test/flop.js b/test/flop.js index 99e7975d..91c49b41 100644 --- a/test/flop.js +++ b/test/flop.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/flop.png', function flop (err) { + const destPath = path.join(dir, 'flop.png'); + m.write(destPath, function flop (err) { finish(err); }); } diff --git a/test/fromBuffer.js b/test/fromBuffer.js index 7047f8fb..1bb5d6db 100644 --- a/test/fromBuffer.js +++ b/test/fromBuffer.js @@ -1,10 +1,11 @@ -var assert = require('assert') -var fs = require('fs') +const assert = require('assert'); +const path = require('path'); +const fs = require('fs') module.exports = function (_, dir, finish, gm) { - var original = dir + '/original.jpg'; - var result = dir + '/fromBuffer.png'; + const original = path.join(dir, 'original.jpg'); + const result = path.join(dir, 'fromBuffer.png'); var buf = fs.readFileSync(original); diff --git a/test/gamma.js b/test/gamma.js index 95b1fe24..61d3adf5 100644 --- a/test/gamma.js +++ b/test/gamma.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/gamma.png', function gamma (err) { + const destPath = path.join(dir, 'gamma.png'); + m.write(destPath, function gamma (err) { finish(err); }); } diff --git a/test/getterColor.js b/test/getterColor.js index 511f197d..9f95a5a6 100644 --- a/test/getterColor.js +++ b/test/getterColor.js @@ -1,11 +1,12 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(dir + '/blue.gif').color(function (err, color) { + const destPath = path.join(dir, 'blue.gif'); + gm(destPath).color(function (err, color) { if (err) return finish(err); assert.equal(1, color) diff --git a/test/getterFormatGIF.js b/test/getterFormatGIF.js index e11895be..0fd6dafd 100644 --- a/test/getterFormatGIF.js +++ b/test/getterFormatGIF.js @@ -1,11 +1,12 @@ - -var assert = require('assert'); +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(dir + '/original.gif') + const destPath = path.join(dir, 'original.gif'); + gm(destPath) .format(function (err, type) { if (err) return finish(err); diff --git a/test/getterIdentify.js b/test/getterIdentify.js index 08a62f57..23d9dfbc 100755 --- a/test/getterIdentify.js +++ b/test/getterIdentify.js @@ -1,6 +1,6 @@ - -var assert = require('assert') -var os = require('os') +const assert = require('assert'); +const path = require('path'); +const os = require('os') var isLinux = os.platform() === 'linux' // Be more lax with the errors if we're on linux @@ -12,8 +12,10 @@ module.exports = function (_, dir, finish, gm) { var im = _._options.imageMagick; - var test = gm(dir + '/photo.JPG'); + const photoPath = path.join(dir, 'photo.JPG'); + var test = gm(photoPath); if (im) test.options({ imageMagick: true }); + test.identify(function (err) { if (err) return finish(err); @@ -64,8 +66,10 @@ module.exports = function (_, dir, finish, gm) { }); function gif (callback) { - var test = gm(dir + '/blue.gif'); + const bluePath = path.join(dir, 'blue.gif'); + var test = gm(bluePath); if (im) test.options({ imageMagick: true }); + test.identify(function (err) { if (err) return finish(err); @@ -99,7 +103,8 @@ module.exports = function (_, dir, finish, gm) { } function pattern () { - var test = gm(dir + '/blue.gif'); + const bluePath = path.join(dir, 'blue.gif'); + var test = gm(bluePath); var format = '%f: %m, %wx%h'; var value = 'blue.gif: GIF, 100x200'; diff --git a/test/getterIptc.js b/test/getterIptc.js index 7d66b13a..73cc6193 100644 --- a/test/getterIptc.js +++ b/test/getterIptc.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) @@ -7,7 +7,8 @@ module.exports = function (_, dir, finish, gm) { var im = _._options.imageMagick; - var test = gm(__dirname + '/fixtures/iptc.jpg'); + const iptcPath = path.join(__dirname, 'fixtures', 'iptc.jpg'); + var test = gm(iptcPath); if (im) test.options({ imageMagick: true }); test.identify(function (err) { diff --git a/test/getterMultipleIptc.js b/test/getterMultipleIptc.js index 9ad735dc..f197b17b 100644 --- a/test/getterMultipleIptc.js +++ b/test/getterMultipleIptc.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) @@ -7,7 +7,8 @@ module.exports = function (_, dir, finish, gm) { var im = _._options.imageMagick; - var test = gm(__dirname + '/fixtures/iptc-multiple.jpg'); + const iptcPath = path.join(__dirname, 'fixtures', 'iptc-multiple.jpg'); + var test = gm(iptcPath); if (im) test.options({ imageMagick: true }); test.identify(function (err) { diff --git a/test/getterSize.js b/test/getterSize.js index 52c673d0..422d6ebd 100644 --- a/test/getterSize.js +++ b/test/getterSize.js @@ -1,5 +1,5 @@ - -var assert = require('assert'); +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) @@ -16,19 +16,22 @@ module.exports = function (_, dir, finish, gm) { }) function sizeJPEG(done) { - gm(dir + '/original.jpg') + const originalPath = path.join(dir, 'original.jpg'); + gm(originalPath) .size(function gettersize (err, size) { if (err) return done(err); assert.equal(size.width, 460); assert.equal(size.height, 155); - gm(dir + '/identifyParseErr.jpg').size(done); + const identifyParseErrPath = path.join(dir, 'identifyParseErr.jpg'); + gm(identifyParseErrPath).size(done); }); } function sizeGIF(done) { - gm(dir + '/original.gif') + const originalGifPath = path.join(dir, 'original.gif'); + gm(originalGifPath) .size(function (err, size) { if (err) return done(err); @@ -40,7 +43,8 @@ module.exports = function (_, dir, finish, gm) { } function sizePNG(done) { - gm(dir + '/original.png') + const originalPngPath = path.join(dir, 'original.png'); + gm(originalPngPath) .size(function (err, size) { if (err) return done(err); diff --git a/test/gh-17.js b/test/gh-17.js index ce6e9181..ebb0c40c 100644 --- a/test/gh-17.js +++ b/test/gh-17.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { var m = gm @@ -16,8 +16,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/cropresize.png', function crop (err) { + const destPath = path.join(dir, 'cropresize.png'); + m.write(destPath, function crop (err) { finish(err); }); } diff --git a/test/gifFrame.js b/test/gifFrame.js index 041c6c63..d67d3b38 100644 --- a/test/gifFrame.js +++ b/test/gifFrame.js @@ -1,13 +1,13 @@ - -var fs = require('fs'); -var assert =require('assert') +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(dir + '/original.gif[0]') - .write(dir + '/gifFrame.jpg', function gifFrame (err){ + const originalGifPath = path.join(dir, 'original.gif[0]'); + const gifFramePath = path.join(dir, 'gifFrame.jpg'); + gm(originalGifPath) + .write(gifFramePath, function gifFrame (err){ finish(err); }); } diff --git a/test/gifFrameIdentify.js b/test/gifFrameIdentify.js index b2f46358..3e16ed1b 100644 --- a/test/gifFrameIdentify.js +++ b/test/gifFrameIdentify.js @@ -1,9 +1,9 @@ - -var assert = require('assert') -var fs = require('fs'); +const assert = require('assert') +const path = require('path'); module.exports = function (_, dir, finish, gm) { - var m = gm(dir + '/original.gif[0]') + const originalGifPath = path.join(dir, 'original.gif[0]'); + var m = gm(originalGifPath); if (!gm.integration) return finish(); diff --git a/test/gifFrameStream.js b/test/gifFrameStream.js index 5e1d9122..90f773a9 100644 --- a/test/gifFrameStream.js +++ b/test/gifFrameStream.js @@ -1,9 +1,10 @@ - -var assert = require('assert') -var fs = require('fs'); +const assert = require('assert') +const path = require('path'); +const fs = require('fs'); module.exports = function (_, dir, finish, gm) { - var m = gm(fs.createReadStream(dir + '/original.gif'), "original.gif[0]") + const originalGifPath = path.join(dir, 'original.gif'); + var m = gm(fs.createReadStream(originalGifPath), "original.gif[0]") var args = m.args(); assert.equal('convert', args[0]); @@ -12,8 +13,8 @@ module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - m - .write(dir + '/gifFrameStream.jpg', function gifFrame (err){ + const destPath = path.join(dir, 'gifFrameStream.jpg'); + m.write(destPath, function gifFrame (err){ finish(err); }); } diff --git a/test/gravity.js b/test/gravity.js index 89515d8f..20dc69e1 100644 --- a/test/gravity.js +++ b/test/gravity.js @@ -1,4 +1,5 @@ -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (img, dir, finish, gm) { var changed = gm('whatever.png').gravity("Souths") @@ -24,8 +25,8 @@ module.exports = function (img, dir, finish, gm) { if (!gm.integration) return finish(); - m - .write(dir + '/gravity.png', function resize (err) { + const destPath = path.join(dir, 'gravity.png'); + m.write(destPath, function resize (err) { finish(err); }); } diff --git a/test/implode.js b/test/implode.js index 1b8577cc..1681220d 100644 --- a/test/implode.js +++ b/test/implode.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/implode.png', function implode (err) { + const destPath = path.join(dir, 'implode.png'); + m.write(destPath, function implode (err) { finish(err); }); } diff --git a/test/index.js b/test/index.js index f614e7eb..2725c0ec 100644 --- a/test/index.js +++ b/test/index.js @@ -5,11 +5,14 @@ const dir = path.join(__dirname, '..', 'examples', 'imgs'); const gm = require('..'); const fs = require('fs'); -var only = process.argv.slice(2); +const only = process.argv.slice(2); gm.integration = !! ~process.argv.indexOf('--integration'); if (gm.integration) only.shift(); -var files = fs.readdirSync(__dirname).filter(filter); +let files = fs.readdirSync(__dirname).filter(filter); +if (files.length === 0) { + console.log('No tests found matching', only); +} function filter (file) { if (!/\.js$/.test(file)) return false; diff --git a/test/inputIs.js b/test/inputIs.js index 37aecf7a..abb4708b 100644 --- a/test/inputIs.js +++ b/test/inputIs.js @@ -1,13 +1,12 @@ - -// gm - Copyright Aaron Heckmann (MIT Licensed) - -var assert = require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (_, dir, finish, gm) { var err; try { - var gif = gm('/path/to/blah.gif'); + const blahPath = path.join('path', 'to', 'blah.gif') ; + var gif = gm(blahPath); assert.equal(true, gif.inputIs('gif')); assert.equal(false, gif.inputIs('jpg')); assert.equal(false, gif.inputIs('crazy')); @@ -17,7 +16,8 @@ module.exports = function (_, dir, finish, gm) { assert.equal(false, png.inputIs('gif')); assert.equal(false, png.inputIs('tif')); - var jpg = gm('super/duper.jpeg'); + const jpgPath = path.join('super', 'duper.jpeg') + var jpg = gm(jpgPath); assert.equal(true, jpg.inputIs('jpg')); assert.equal(true, jpg.inputIs('jpeg')); assert.equal(false, jpg.inputIs('gif')); diff --git a/test/interlace.js b/test/interlace.js index 2239831e..cbbc4296 100644 --- a/test/interlace.js +++ b/test/interlace.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/edge.png', function edge (err) { + const destPath = path.join(dir, 'edge.png'); + m.write(destPath, function edge (err) { finish(err); }); } diff --git a/test/label.js b/test/label.js index b23e2ca9..52138287 100644 --- a/test/label.js +++ b/test/label.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/label.png', function label (err) { + const destPath = path.join(dir, 'label.png'); + m.write(destPath, function label (err) { finish(err); }); } diff --git a/test/limit.js b/test/limit.js index b725d5f0..ff7a99f8 100644 --- a/test/limit.js +++ b/test/limit.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -19,8 +19,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/limit.png', function limit (err) { + const destPath = path.join(dir, 'limit.png'); + m.write(destPath, function limit (err) { finish(err); }); } diff --git a/test/line.js b/test/line.js index bfba6f92..635e5cde 100644 --- a/test/line.js +++ b/test/line.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -21,8 +21,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/line.png', function line (err) { + const destPath = path.join(dir, 'line.png'); + m.write(destPath, function line (err) { finish(err); }); } diff --git a/test/lower.js b/test/lower.js index 230ca55d..972b8e73 100644 --- a/test/lower.js +++ b/test/lower.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/lower.png', function lower (err) { + const destPath = path.join(dir, 'lower.png'); + m.write(destPath, function lower (err) { finish(err); }); } diff --git a/test/magnify.js b/test/magnify.js index 1fbb4be1..4a150cce 100644 --- a/test/magnify.js +++ b/test/magnify.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -17,8 +17,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/magnify.png', function magnify (err) { + const destPath = path.join(dir, 'magnify.png'); + m.write(destPath, function magnify (err) { finish(err); }); } diff --git a/test/median.js b/test/median.js index e6a90389..7445df17 100644 --- a/test/median.js +++ b/test/median.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/median.png', function media (err) { + const destPath = path.join(dir, 'median.png'); + m.write(destPath, function media (err) { finish(err); }); } diff --git a/test/minify.js b/test/minify.js index d34ed544..dd6388d1 100644 --- a/test/minify.js +++ b/test/minify.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { if (gm._options.imageMagick) return finish(); @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/minify.png', function minify (err) { + const destPath = path.join(dir, 'minify.png'); + m.write(destPath, function minify (err) { finish(err); }); } diff --git a/test/minifyIM.js b/test/minifyIM.js index b7307962..d498a657 100644 --- a/test/minifyIM.js +++ b/test/minifyIM.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { var m = gm.minify(); @@ -11,11 +11,12 @@ module.exports = function (gm, dir, finish, GM) { if(gm._options.imageMagick) { assert.throws( function() { - m.write(dir + '/minify.png', function minify (err) { throw err;}) + const destPath = path.join(dir, 'minify.png'); + m.write(destPath, function minify (err) { throw err;}) }, Error ); } - return finish(); + return finish(); } \ No newline at end of file diff --git a/test/modulate.js b/test/modulate.js index 5c5c62e8..02e2cb8a 100644 --- a/test/modulate.js +++ b/test/modulate.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/modulate.png', function modulate (err) { + const destPath = path.join(dir, 'modulate.png'); + m.write(destPath, function modulate (err) { finish(err); }); } diff --git a/test/monochrome.js b/test/monochrome.js index 733f2769..79975fa0 100644 --- a/test/monochrome.js +++ b/test/monochrome.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -13,8 +13,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/monochrome.png', function monochrome (err) { + const destPath = path.join(dir, 'monochrome.png'); + m.write(destPath, function monochrome (err) { finish(err); }); } diff --git a/test/montage.js b/test/montage.js index 8c126712..0b3eef47 100644 --- a/test/montage.js +++ b/test/montage.js @@ -1,20 +1,24 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { - gm.source = __dirname + '/fixtures/compare_1.png'; - var a = gm.montage(__dirname + '/fixtures/favicon.png') + const fixturesPath = path.join(__dirname, 'fixtures'); + const srcPath = path.join(fixturesPath, 'compare_1.png'); + + gm.source = srcPath; + const faviconPath = path.join(fixturesPath, 'favicon.png'); + var a = gm.montage(faviconPath); var args = a.args(); assert.equal('montage', args[0]); - assert.equal(__dirname + '/fixtures/favicon.png', args[1]); - assert.equal(__dirname + '/fixtures/compare_1.png', args[2]); + assert.equal(faviconPath, args[1]); + assert.equal(srcPath, args[2]); if (!GM.integration) return finish(); - a - .write(dir + '/montage.png', function(err) { + const destPath = path.join(dir, 'montage.png'); + a.write(destPath, function(err) { finish(err); }); } diff --git a/test/morph-more.js b/test/morph-more.js index fdbd851d..63a1cc98 100644 --- a/test/morph-more.js +++ b/test/morph-more.js @@ -1,4 +1,4 @@ -var assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -7,8 +7,12 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); + const morpherPath = path.join(dir, 'morpher.jpg'); + const originalPath = path.join(dir, 'original.png'); + const morphedPath = path.join(dir, 'morphed2.jpg'); + gm - .morph([dir + '/morpher.jpg', dir + '/original.png'], dir + '/morphed2.jpg', function morph (err) { + .morph([morpherPath, originalPath], morphedPath, function morph (err) { finish(err); }); } diff --git a/test/morph.js b/test/morph.js index 293e0076..e5bccc59 100644 --- a/test/morph.js +++ b/test/morph.js @@ -1,5 +1,4 @@ - -var assert = require('assert') +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -8,10 +7,10 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - // todo, improve this api to allow multiple images + const morpherPath = path.join(dir, 'morpher.jpg'); + const morphedPath = path.join(dir, 'morphed.jpg'); - gm - .morph(dir + '/morpher.jpg', dir + '/morphed.jpg', function morph (err) { + gm.morph(morpherPath, morphedPath, function morph (err) { finish(err); }); } diff --git a/test/negative.js b/test/negative.js index eef2c3b4..1de124fb 100644 --- a/test/negative.js +++ b/test/negative.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -16,8 +16,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/negative.png', function negative (err) { + const destPath = path.join(dir, 'negative.png'); + m.write(destPath, function negative (err) { finish(err); }); } diff --git a/test/new.js b/test/new.js index b0cbedd5..b73ffd20 100644 --- a/test/new.js +++ b/test/new.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { @@ -37,8 +37,8 @@ module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - m - .write(dir + '/new.png', function New (err){ + const destPath = path.join(dir, 'new.png'); + m.write(destPath, function New (err){ finish(err); }); } diff --git a/test/newImage.js b/test/newImage.js index 80d8f955..f09e3cb7 100644 --- a/test/newImage.js +++ b/test/newImage.js @@ -1,19 +1,21 @@ // https://github.com/aheckmann/gm/issues/127 -var assert = require('assert') -var fs = require('fs') +const path = require('path'); +const fs = require('fs') module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - createImage().write(dir + '/ignore.me.png', function (err) { + const dest1Path = path.join(dir, 'ignore.me.png'); + createImage().write(dest1Path, function (err) { if (err) return finish(err); createImage().stream(function (err, stdout) { if (err) return finish(err); - stdout.pipe(fs.createWriteStream(dir + '/ignore.me.2.png')) + const dest2Path = path.join(dir, 'ignore.me.2.png'); + stdout.pipe(fs.createWriteStream(dest2Path)) stdout.on('error', finish) stdout.on('end', finish) diff --git a/test/noise1.js b/test/noise1.js index e302678a..9ed9dedc 100644 --- a/test/noise1.js +++ b/test/noise1.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/noise1.png', function noise1 (err) { + const destPath = path.join(dir, 'noise1.png'); + m.write(destPath, function noise1 (err) { finish(err); }); } diff --git a/test/noise2.js b/test/noise2.js index 039c509c..68817248 100644 --- a/test/noise2.js +++ b/test/noise2.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,9 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/noise2.png', function noise2 (err) { + + const destPath = path.join(dir, 'noise2.png'); + m.write(destPath, function noise2 (err) { finish(err); }); } diff --git a/test/options.js b/test/options.js index aaa8bd80..aa31cb21 100644 --- a/test/options.js +++ b/test/options.js @@ -1,6 +1,6 @@ - -var assert = require('assert') - , fs = require('fs') +const assert = require('assert'); +const path = require('path'); +const fs = require('fs'); module.exports = function (_, dir, finish, gm) { @@ -20,13 +20,14 @@ module.exports = function (_, dir, finish, gm) { assert.equal(true, s2._options.subclassed); assert.equal(undefined, s2._options.setWithMethod); - var writeFile = dir + '/IM-negative' + Math.random() + '.png'; - var imageMagick = gm.subClass({ imageMagick: true }); + const writeFile = path.join(dir, `IM-negative${Math.random()}.png`); + const imageMagick = gm.subClass({ imageMagick: true }); if (!gm.integration) return finish(); - imageMagick(dir + '/photo.JPG') + const photoPath = path.join(dir, 'photo.JPG'); + imageMagick(photoPath) .negative() .write(writeFile, function (err, _1, _2, cmd) { if (err) return finish(err); @@ -40,7 +41,7 @@ module.exports = function (_, dir, finish, gm) { } catch (e) {} /// inline options - gm(dir + '/photo.JPG') + gm(photoPath) .negative() .options({ imageMagick: true }) .write(writeFile, function (err, _1, _2, cmd) { diff --git a/test/paint.js b/test/paint.js index 227b967d..075747e0 100644 --- a/test/paint.js +++ b/test/paint.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/paint.png', function paint (err) { + const destPath = path.join(dir, 'paint.png'); + m.write(destPath, function paint (err) { finish(err); }); } diff --git a/test/polygon.js b/test/polygon.js index 8d56628c..2a7c714b 100644 --- a/test/polygon.js +++ b/test/polygon.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -29,8 +29,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/polygon.png', function polygon (err) { + const destPath = path.join(dir, 'polygon.png'); + m.write(destPath, function polygon (err) { finish(err); }); } diff --git a/test/polyline.js b/test/polyline.js index 91dadae7..487a5451 100644 --- a/test/polyline.js +++ b/test/polyline.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -29,8 +29,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/polyline.png', function polyline (err) { + const destPath = path.join(dir, 'polyline.png'); + m.write(destPath, function polyline (err) { finish(err); }); } diff --git a/test/quality.js b/test/quality.js index b7bc6183..f0f5785a 100644 --- a/test/quality.js +++ b/test/quality.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/quality.png', function quality (err) { + const destPath = path.join(dir, 'quality.png'); + m.write(destPath, function quality (err) { finish(err); }); } diff --git a/test/raise.js b/test/raise.js index e154f432..4d630e12 100644 --- a/test/raise.js +++ b/test/raise.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/raise.png', function raise (err) { + const destPath = path.join(dir, 'raise.png'); + m.write(destPath, function raise (err) { finish(err); }); } diff --git a/test/rectangle.js b/test/rectangle.js index da927e89..00e5b6c2 100644 --- a/test/rectangle.js +++ b/test/rectangle.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -32,8 +32,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/rectangle.png', function rectangle (err) { + const destPath = path.join(dir, 'rectangle.png'); + m.write(destPath, function rectangle (err) { finish(err); }); } diff --git a/test/region.js b/test/region.js index 7c62e3ee..07fa6a20 100644 --- a/test/region.js +++ b/test/region.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/region.png', function region (err) { + const destPath = path.join(dir, 'region.png'); + m.write(destPath, function region (err) { finish(err); }); } diff --git a/test/repagePlus.js b/test/repagePlus.js index a7376ba3..72c587b6 100644 --- a/test/repagePlus.js +++ b/test/repagePlus.js @@ -1,4 +1,5 @@ -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM, im) { @@ -15,8 +16,8 @@ module.exports = function (gm, dir, finish, GM, im) { if (!GM.integration) return finish(); - m - .write(dir + '/repage.png', function blur (err) { + const destPath = path.join(dir, 'repage.png'); + m.write(destPath, function blur (err) { finish(err); }); } diff --git a/test/resample.js b/test/resample.js index f048c2fd..688a12fe 100644 --- a/test/resample.js +++ b/test/resample.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/resample.png', function resample (err) { + const destPath = path.join(dir, 'resample.png'); + m.write(destPath, function resample (err) { finish(err); }); } diff --git a/test/resize.js b/test/resize.js index 7c6b6957..fae94c65 100644 --- a/test/resize.js +++ b/test/resize.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -50,8 +50,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/resize.png', function resize (err) { + const destPath = path.join(dir, 'resize.png'); + m.write(destPath, function resize (err) { finish(err); }); } diff --git a/test/resizeAndAutoOrientFromBuffer.js b/test/resizeAndAutoOrientFromBuffer.js index 522bdf98..04a56443 100755 --- a/test/resizeAndAutoOrientFromBuffer.js +++ b/test/resizeAndAutoOrientFromBuffer.js @@ -1,10 +1,11 @@ -var assert = require('assert') -var fs = require('fs') +const assert = require('assert'); +const path = require('path'); +const fs = require('fs') module.exports = function (_, dir, finish, gm) { - var original = dir + '/orientation/Portrait_7.jpg'; - var result = dir + '/resizeAutoOrientFromBuffer.png'; + const original = path.join(dir, 'orientation', 'Portrait_7.jpg'); + const result = path.join(dir, 'resizeAutoOrientFromBuffer.png'); var buf = fs.readFileSync(original); diff --git a/test/resizeBuffer.js b/test/resizeBuffer.js index 208e91a5..a5087272 100755 --- a/test/resizeBuffer.js +++ b/test/resizeBuffer.js @@ -1,10 +1,11 @@ -var assert = require('assert') -var fs = require('fs') +const assert = require('assert'); +const path = require('path'); +const fs = require('fs') module.exports = function (_, dir, finish, gm) { - var original = dir + '/original.jpg'; - var result = dir + '/resizeFromBuffer.png'; + var original = path.join(dir, 'original.jpg'); + var result = path.join(dir, 'resizeFromBuffer.png'); var buf = fs.readFileSync(original); diff --git a/test/resizeWrong.js b/test/resizeWrong.js index dcf71124..378c783f 100644 --- a/test/resizeWrong.js +++ b/test/resizeWrong.js @@ -1,12 +1,11 @@ -var assert = require('assert') -var fs = require('fs') +const path = require('path'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - var original = dir + '/original.png'; - var resized = dir + '/resize'; + const original = path.join(dir, 'original.png'); + const resized = path.join(dir, 'resize'); var widths = [300, 700, 400, 800, 200], i, cb; var resizeExact = function (width, index) { var name = resized + index + '.png'; diff --git a/test/roll.js b/test/roll.js index 2c246339..1554841a 100644 --- a/test/roll.js +++ b/test/roll.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/roll.png', function roll (err) { + const destPath = path.join(dir, 'roll.png'); + m.write(destPath, function roll (err) { finish(err); }); } diff --git a/test/rotate.js b/test/rotate.js index 42747b85..28bd2cb1 100644 --- a/test/rotate.js +++ b/test/rotate.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -16,13 +16,13 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/rotate.png', function rotate (err, _0, _1, cmd) { + const destPath = path.join(dir, 'rotate.png'); + m.write(destPath, function rotate (err, _0, _1, cmd) { assert.ok(/"-rotate" "-40"/.test(cmd)); m .rotate('red', 0) - .write(dir + '/rotate.png', function rotate (err, _0, _1, cmd) { + .write(destPath, function rotate (err, _0, _1, cmd) { assert.ok(!/"-rotate" "-40"/.test(cmd)); assert.ok(/"-rotate" "0"/.test(cmd)); finish(err); diff --git a/test/scale.js b/test/scale.js index 09b542e2..d9f0e298 100644 --- a/test/scale.js +++ b/test/scale.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -36,8 +36,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/scale.png', function scale (err) { + const destPath = path.join(dir, 'scale.png'); + m.write(destPath, function scale (err) { finish(err); }); } diff --git a/test/selectFrame.js b/test/selectFrame.js index 0626bb6d..ce74b186 100644 --- a/test/selectFrame.js +++ b/test/selectFrame.js @@ -1,8 +1,9 @@ -var assert = require('assert'); -var fs = require('fs') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { - var m = gm(dir + '/original.gif[0]') + const gifPath = path.join(dir, 'original.gif[0]'); + var m = gm(gifPath); if (!gm.integration) return finish(); diff --git a/test/sepia.js b/test/sepia.js index 12188f90..3c527a28 100644 --- a/test/sepia.js +++ b/test/sepia.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -16,8 +16,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/sepia.png', function sepia (err) { + const destPath = path.join(dir, 'sepia.png'); + m.write(destPath, function sepia (err) { finish(err); }); } diff --git a/test/setFormat.js b/test/setFormat.js index 221fa412..bd465ef0 100644 --- a/test/setFormat.js +++ b/test/setFormat.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -11,8 +11,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/setformat', function setformat (err) { + const destPath = path.join(dir, 'setFormat.png'); + m.write(destPath, function setformat (err) { finish(err); }); } diff --git a/test/sharpen.js b/test/sharpen.js index e6e53a70..bedc1436 100644 --- a/test/sharpen.js +++ b/test/sharpen.js @@ -1,5 +1,5 @@ - -var assert =require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/sharpen.png', function sharpen (err) { + const destPath = path.join(dir, 'sharpen.png'); + m.write(destPath, function sharpen (err) { finish(err); }); } diff --git a/test/solarize.js b/test/solarize.js index a52cc814..10fd0422 100644 --- a/test/solarize.js +++ b/test/solarize.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/solarize.png', function solarize (err) { + const destPath = path.join(dir, 'solarize.png'); + m.write(destPath, function solarize (err) { finish(err); }); } diff --git a/test/spread.js b/test/spread.js index 127003f6..e1ca3a1d 100644 --- a/test/spread.js +++ b/test/spread.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/spread.png', function spread (err) { + const destPath = path.join(dir, 'spread.png'); + m.write(destPath, function spread (err) { finish(err); }); } diff --git a/test/streamIn.js b/test/streamIn.js index 7a51f6d3..4caa7895 100644 --- a/test/streamIn.js +++ b/test/streamIn.js @@ -1,11 +1,12 @@ - -var assert = require('assert') -var fs = require('fs'); +const assert = require('assert'); +const path = require('path'); +const fs = require('fs'); module.exports = function (_, dir, finish, gm) { - var stream = fs.createReadStream(dir + '/original.jpg'); - var m = gm(stream, "original.jpg"); + const originalPath = path.join(dir, 'original.jpg'); + const stream = fs.createReadStream(originalPath); + const m = gm(stream, "original.jpg"); assert.equal(stream, m.sourceStream); assert.equal('original.jpg', m.source); @@ -13,8 +14,8 @@ module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - m - .write(dir + '/streamIn.png', function streamIn (err) { + const destPath = path.join(dir, 'streamIn.png'); + m.write(destPath, function streamIn (err) { finish(err); }); } diff --git a/test/streamInGetter.js b/test/streamInGetter.js index 9fed5f99..554364e4 100644 --- a/test/streamInGetter.js +++ b/test/streamInGetter.js @@ -1,14 +1,15 @@ - -var assert = require('assert') -var fs = require('fs'); +const path = require('path'); +const fs = require('fs'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(fs.createReadStream(dir + '/original.jpg')) + const originalPath = path.join(dir, 'original.jpg'); + gm(fs.createReadStream(originalPath)) .size({bufferStream: true}, function (err, size) { - this.write(dir + '/streamInGetter.png', function streamInGetter (err){ + const destPath = path.join(dir, 'streamInGetter.png'); + this.write(destPath, function streamInGetter (err){ finish(err); }); }); diff --git a/test/streamInOut.js b/test/streamInOut.js index aea32a2d..fdaafe82 100644 --- a/test/streamInOut.js +++ b/test/streamInOut.js @@ -1,15 +1,17 @@ - -var fs = require('fs'); +const path = require('path'); +const fs = require('fs'); module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(fs.createReadStream(dir + '/original.jpg'), "original.jpg") + const originalPath = path.join(dir, 'original.jpg'); + gm(fs.createReadStream(originalPath), "original.jpg") .stream(function streamOut (err, stdout, stderr) { if (err) return finish(err); - stdout.pipe(fs.createWriteStream(dir + '/streamInOut.jpg')); + const destPath = path.join(dir, 'streamInOut.jpg'); + stdout.pipe(fs.createWriteStream(destPath)); stdout.on('error', finish); stdout.on('close', finish); }); diff --git a/test/streamOut.js b/test/streamOut.js index 3b070db2..222787cf 100644 --- a/test/streamOut.js +++ b/test/streamOut.js @@ -1,5 +1,5 @@ - -var fs = require('fs'); +const path = require('path'); +const fs = require('fs'); module.exports = function (gm, dir, finish, GM) { @@ -16,7 +16,8 @@ module.exports = function (gm, dir, finish, GM) { gm .stream(function streamOut (err, stdout, stderr) { if (err) return done(err); - stdout.pipe(fs.createWriteStream(dir + '/streamOut.png')); + const destPath = path.join(dir, 'streamOut.png'); + stdout.pipe(fs.createWriteStream(destPath)); stdout.on('error', done); stdout.on('close', done); }); @@ -25,7 +26,8 @@ module.exports = function (gm, dir, finish, GM) { function withoutCallback(done) { var stream = gm.stream() stream.on('error', done) - stream.pipe(fs.createWriteStream(dir + '/streamOut2.png')) + const destPath = path.join(dir, 'streamOut2.png'); + stream.pipe(fs.createWriteStream(destPath)) stream.on('end', done) } } diff --git a/test/streamOutFormat.js b/test/streamOutFormat.js index 4924d265..71a81957 100644 --- a/test/streamOutFormat.js +++ b/test/streamOutFormat.js @@ -1,18 +1,8 @@ - -var assert = require('assert') -var fs = require('fs'); +const assert = require('assert') +const path = require('path'); +const fs = require('fs'); module.exports = function (gm, dir, finish, GM) { - /* - assert.throws(function () { - gm.stream() - }, /expects a callback/); - - assert.throws(function () { - gm.stream('PNG') - }, /expects a callback/); - */ - if (!GM.integration) return finish(); @@ -30,7 +20,8 @@ module.exports = function (gm, dir, finish, GM) { gm .stream('PNG', function streamOut (err, stdout, stderr) { if (err) return done(err); - stdout.pipe(fs.createWriteStream(dir + '/streamOut.png')); + const destPath = path.join(dir, 'streamOutFormat.png'); + stdout.pipe(fs.createWriteStream(destPath)); stdout.on('error', done); stdout.on('close', done); }); @@ -39,7 +30,8 @@ module.exports = function (gm, dir, finish, GM) { function withoutCallback(done) { var stream = gm.stream('PNG') stream.on('error', done) - stream.pipe(fs.createWriteStream(dir + '/streamOut2.png')) + const destPath = path.join(dir, 'streamOutFormat2.png'); + stream.pipe(fs.createWriteStream(destPath)) stream.on('end', done) } diff --git a/test/strip.js b/test/strip.js index d08cfe8b..7f7c0cb7 100644 --- a/test/strip.js +++ b/test/strip.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -15,8 +15,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/edge.png', function edge (err) { + const destPath = path.join(dir, 'strip.png'); + m.write(destPath, function edge (err) { finish(err); }); } diff --git a/test/subclass.js b/test/subclass.js index 08ee5b15..3d251f9b 100644 --- a/test/subclass.js +++ b/test/subclass.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (_, dir, finish, gm) { assert.equal('gm', gm('test').constructor.name); @@ -23,8 +23,10 @@ module.exports = function (_, dir, finish, gm) { if (!gm.integration) return finish(); - gm(dir + '/photo.JPG') - .thumb(50, 80, dir + '/SUBthumb.png', function subthumb (err) { + const sourcePath = path.join(dir, 'photo.JPG'); + const destPath = path.join(dir, 'subclass.png'); + gm(sourcePath) + .thumb(50, 80, destPath, function subthumb (err) { if (err) return finish(err); finish(); }); diff --git a/test/swirl.js b/test/swirl.js index d12d917f..51f1b0c8 100644 --- a/test/swirl.js +++ b/test/swirl.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/swirl.png', function swirl (err) { + const destPath = path.join(dir, 'swirl.png'); + m.write(destPath, function swirl (err) { finish(err); }); } diff --git a/test/text.js b/test/text.js index 8e9314ca..8e680cc6 100644 --- a/test/text.js +++ b/test/text.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -32,8 +32,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/text.png', function text (err) { + const destPath = path.join(dir, 'text.png'); + m.write(destPath, function text (err) { finish(err); }); } diff --git a/test/thumb.js b/test/thumb.js index 071b3217..e180a844 100644 --- a/test/thumb.js +++ b/test/thumb.js @@ -1,13 +1,13 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - gm - .thumb(150, 40, dir + '/thumb.png', function thumb (err) { + const destPath = path.join(dir, 'thumb.png'); + gm.thumb(150, 40, destPath, function thumb (err) { finish(err); }); } diff --git a/test/thumbnail.js b/test/thumbnail.js index cb9da86c..28054054 100644 --- a/test/thumbnail.js +++ b/test/thumbnail.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (gm, dir, finish, GM) { @@ -14,8 +14,8 @@ module.exports = function (gm, dir, finish, GM) { if (!GM.integration) return finish(); - m - .write(dir + '/thumbnail.png', function thumbnail (err) { + const destPath = path.join(dir, 'thumbnail.png'); + m.write(destPath, function thumbnail (err) { finish(err); }); } diff --git a/test/timeout.js b/test/timeout.js index a7e6e762..ab416d20 100644 --- a/test/timeout.js +++ b/test/timeout.js @@ -1,5 +1,5 @@ - -var assert = require('assert') +const assert = require('assert'); +const path = require('path'); module.exports = function (img, dir, finish, gm) { @@ -16,16 +16,18 @@ module.exports = function (img, dir, finish, gm) { if (!gm.integration) return finish(); - gm(dir + '/photo.JPG').options({ timeout: 1 }) - .thumb(50, 80, dir + '/timeout.png', function subthumb (err) { + const sourcePath = path.join(dir, 'photo.JPG'); + const timeoutPath = path.join(dir, 'timeout.png'); + gm(sourcePath).options({ timeout: 1 }) + .thumb(50, 80, timeoutPath, function subthumb (err) { assert.ok(err, "Expecting a timeout error"); noTimeout(); }); function noTimeout() { - gm(dir + '/photo.JPG').options({ timeout: 0 }) - .thumb(50, 80, dir + '/timeout.png', function subthumb (err) { + gm(sourcePath).options({ timeout: 0 }) + .thumb(50, 80, timeoutPath, function subthumb (err) { finish(err); }); } diff --git a/test/webp.js b/test/webp.js index 65890a1d..5cb7b155 100644 --- a/test/webp.js +++ b/test/webp.js @@ -1,20 +1,21 @@ -var assert = require('assert') -var fs = require('fs') +const assert = require('assert'); +const path = require('path'); +const fs = require('fs') module.exports = function (_, dir, finish, gm, im) { if (!gm.integration) return finish() // Don't know how to install IM with WEBP on ubuntu - if (require('os').platform() === 'linux') return finish() + // if (require('os').platform() === 'linux') return finish() // GraphicsMagick currently does not support webp :( - if (!im) return finish() + // if (!im) return finish() gm = gm.subClass({ imageMagick: true }) - var image = dir + '/original.png' + const imagePath = path.join(dir, 'original.png'); write(function (err) { if (err) return finish(err) @@ -23,11 +24,12 @@ module.exports = function (_, dir, finish, gm, im) { }) function write(done) { - gm(image) - .write(dir + '/original.x.webp', function (err) { + const webpPath = path.join(dir, 'original.x.webp'); + gm(imagePath) + .write(webpPath, function (err) { if (err) return done(err) - gm(dir + '/original.x.webp').identify(function (err, value) { + gm(webpPath).identify(function (err, value) { if (err) return done(err) assert.ok(value) @@ -38,7 +40,7 @@ module.exports = function (_, dir, finish, gm, im) { } function stream(done) { - gm(image) + gm(imagePath) .stream('webp', function (err, stdout) { if (err) return done(err)