Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-12-19 07:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tests: use native fs.rm instead of rimraf

Browse Source
This commit is contained in:
Lovell Fuller
2023-02-12 19:31:44 +00:00
parent 42d2f07e44
commit b96c8e8ba4
4 changed files with 53 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/unit/io.js
View File

@@ -3,7 +3,6 @@
const fs = require('fs');
const path = require('path');
const assert = require('assert');
const rimraf = require('rimraf');
const sharp = require('../../');
const fixtures = require('../fixtures');
@@ -28,7 +27,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
});
sharp(fixtures.inputJpg).resize(320, 240).pipe(writable);
@@ -45,7 +44,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
});
sharp(inputJpgBuffer).resize(320, 240).pipe(writable);
@@ -59,7 +58,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
readable.pipe(pipeline);
});
@@ -143,7 +142,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
});
const pipeline = sharp().resize(320, 240);
@@ -231,7 +230,7 @@ describe('Input/output', function () {
});
writable.on('close', function () {
assert.strictEqual(true, infoEventEmitted);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
readable.pipe(pipeline).pipe(writable);
});
@@ -246,7 +245,7 @@ describe('Input/output', function () {
});
writable.on('close', function () {
assert.strictEqual(true, closeEventEmitted);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
readable.pipe(pipeline).pipe(writable);
});
@@ -258,7 +257,7 @@ describe('Input/output', function () {
anErrorWasEmitted = !!err;
}).on('end', function () {
assert(anErrorWasEmitted);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
const readableButNotAnImage = fs.createReadStream(__filename);
const writable = fs.createWriteStream(outputJpg);
@@ -272,7 +271,7 @@ describe('Input/output', function () {
anErrorWasEmitted = !!err;
}).on('end', function () {
assert(anErrorWasEmitted);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
const writable = fs.createWriteStream(outputJpg);
readableButNotAnImage.pipe(writable);
@@ -289,7 +288,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(240, info.height);
rimraf(outputJpg, done);
fs.rm(outputJpg, done);
});
});
const pipeline = sharp().resize(320, 240);
@@ -567,7 +566,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(80, info.height);
rimraf(outputZoinks, done);
fs.rm(outputZoinks, done);
});
});
@@ -580,7 +579,7 @@ describe('Input/output', function () {
assert.strictEqual('png', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(80, info.height);
rimraf(outputZoinks, done);
fs.rm(outputZoinks, done);
});
});
@@ -593,7 +592,7 @@ describe('Input/output', function () {
assert.strictEqual('webp', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(80, info.height);
rimraf(outputZoinks, done);
fs.rm(outputZoinks, done);
});
});
@@ -606,7 +605,7 @@ describe('Input/output', function () {
assert.strictEqual('tiff', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(80, info.height);
rimraf(outputZoinks, done);
fs.rm(outputZoinks, done);
});
});
@@ -620,7 +619,7 @@ describe('Input/output', function () {
assert.strictEqual('jpeg', info.format);
assert.strictEqual(320, info.width);
assert.strictEqual(80, info.height);
rimraf(outputZoinks, done);
fs.rm(outputZoinks, done);
});
});
});
@@ -657,7 +656,7 @@ describe('Input/output', function () {
.toFile(outputWebP, function (err, info) {
if (err) throw err;
assert.strictEqual('jpeg', info.format);
rimraf(outputWebP, done);
fs.rm(outputWebP, done);
});
});
@@ -695,7 +694,7 @@ describe('Input/output', function () {
assert.strictEqual('v', info.format);
assert.strictEqual(70, info.width);
assert.strictEqual(60, info.height);
rimraf(outputV, done);
fs.rm(outputV, done);
});
});

22
test/unit/tiff.js
View File

@@ -2,8 +2,6 @@
const fs = require('fs');
const assert = require('assert');
const promisify = require('util').promisify;
const rimraf = require('rimraf');
const sharp = require('../../');
const fixtures = require('../fixtures');
@@ -128,7 +126,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert.strictEqual(startSize, info.size);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -145,7 +143,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size < (startSize / 2));
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -167,7 +165,7 @@ describe('TIFF', function () {
.metadata()
.then(({ density }) => {
assert.strictEqual(25400, density);
return promisify(rimraf)(outputTiff);
return fs.promises.rm(outputTiff);
})
)
);
@@ -232,7 +230,7 @@ describe('TIFF', function () {
assert.strictEqual('tiff', info.format);
assert.strictEqual(3, info.channels);
assert(info.size < startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -284,7 +282,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size < startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -323,7 +321,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size < startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -338,7 +336,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(startSize > info.size);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -353,7 +351,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size < startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -367,7 +365,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size < startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});
@@ -445,7 +443,7 @@ describe('TIFF', function () {
if (err) throw err;
assert.strictEqual('tiff', info.format);
assert(info.size > startSize);
rimraf(outputTiff, done);
fs.rm(outputTiff, done);
});
});

55
test/unit/tile.js
View File

@@ -5,7 +5,6 @@ const path = require('path');
const assert = require('assert');
const eachLimit = require('async/eachLimit');
const rimraf = require('rimraf');
const extractZip = require('extract-zip');
const sharp = require('../../');
@@ -327,7 +326,7 @@ describe('Tile', function () {
it('Deep Zoom layout', function (done) {
const directory = fixtures.path('output.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.toFile(fixtures.path('output.dzi'), function (err, info) {
if (err) throw err;
@@ -343,7 +342,7 @@ describe('Tile', function () {
it('Deep Zoom layout with custom size+overlap', function (done) {
const directory = fixtures.path('output.512.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 512,
@@ -365,7 +364,7 @@ describe('Tile', function () {
it('Deep Zoom layout with custom size+angle', function (done) {
const directory = fixtures.path('output.512_90.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 512,
@@ -399,7 +398,7 @@ describe('Tile', function () {
it('Deep Zoom layout with depth of one', function (done) {
const directory = fixtures.path('output.512_depth_one.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 512,
@@ -415,7 +414,7 @@ describe('Tile', function () {
it('Deep Zoom layout with depth of onepixel', function (done) {
const directory = fixtures.path('output.512_depth_onepixel.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 512,
@@ -431,7 +430,7 @@ describe('Tile', function () {
it('Deep Zoom layout with depth of onetile', function (done) {
const directory = fixtures.path('output.256_depth_onetile.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 256,
@@ -447,7 +446,7 @@ describe('Tile', function () {
it('Deep Zoom layout with skipBlanks', function (done) {
const directory = fixtures.path('output.256_skip_blanks.dzi_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpgOverlayLayer2)
.tile({
size: 256,
@@ -466,7 +465,7 @@ describe('Tile', function () {
it('Zoomify layout', function (done) {
const directory = fixtures.path('output.zoomify.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
layout: 'zoomify'
@@ -490,7 +489,7 @@ describe('Tile', function () {
it('Zoomify layout with depth one', function (done) {
const directory = fixtures.path('output.zoomify.depth_one.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 256,
@@ -511,7 +510,7 @@ describe('Tile', function () {
it('Zoomify layout with depth onetile', function (done) {
const directory = fixtures.path('output.zoomify.depth_onetile.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 256,
@@ -532,7 +531,7 @@ describe('Tile', function () {
it('Zoomify layout with depth onepixel', function (done) {
const directory = fixtures.path('output.zoomify.depth_onepixel.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
size: 256,
@@ -553,7 +552,7 @@ describe('Tile', function () {
it('Zoomify layout with skip blanks', function (done) {
const directory = fixtures.path('output.zoomify.skipBlanks.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpgOverlayLayer2)
.tile({
size: 256,
@@ -577,7 +576,7 @@ describe('Tile', function () {
it('Google layout', function (done) {
const directory = fixtures.path('output.google.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
layout: 'google'
@@ -601,7 +600,7 @@ describe('Tile', function () {
it('Google layout with jpeg format', function (done) {
const directory = fixtures.path('output.jpg.google.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.jpeg({
quality: 1
@@ -638,7 +637,7 @@ describe('Tile', function () {
it('Google layout with png format', function (done) {
const directory = fixtures.path('output.png.google.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.png({
compressionLevel: 0
@@ -675,7 +674,7 @@ describe('Tile', function () {
it('Google layout with webp format', function (done) {
const directory = fixtures.path('output.webp.google.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.webp({
quality: 1,
@@ -713,7 +712,7 @@ describe('Tile', function () {
it('Google layout with depth one', function (done) {
const directory = fixtures.path('output.google_depth_one.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
layout: 'google',
@@ -735,7 +734,7 @@ describe('Tile', function () {
it('Google layout with depth onepixel', function (done) {
const directory = fixtures.path('output.google_depth_onepixel.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
layout: 'google',
@@ -757,7 +756,7 @@ describe('Tile', function () {
it('Google layout with depth onetile', function (done) {
const directory = fixtures.path('output.google_depth_onetile.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
layout: 'google',
@@ -779,7 +778,7 @@ describe('Tile', function () {
it('Google layout with default skip Blanks', function (done) {
const directory = fixtures.path('output.google_depth_skipBlanks.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputPng)
.tile({
layout: 'google',
@@ -804,7 +803,7 @@ describe('Tile', function () {
it('Google layout with center image in tile', function (done) {
const directory = fixtures.path('output.google_center.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
center: true,
@@ -824,7 +823,7 @@ describe('Tile', function () {
it('Google layout with center image in tile centre', function (done) {
const directory = fixtures.path('output.google_center.dzi');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
centre: true,
@@ -845,7 +844,7 @@ describe('Tile', function () {
it('IIIFv2 layout', function (done) {
const name = 'output.iiif.info';
const directory = fixtures.path(name);
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
const id = 'https://sharp.test.com/iiif';
sharp(fixtures.inputJpg)
.tile({
@@ -875,7 +874,7 @@ describe('Tile', function () {
it('IIIFv3 layout', function (done) {
const name = 'output.iiif3.info';
const directory = fixtures.path(name);
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
const id = 'https://sharp.test.com/iiif3';
sharp(fixtures.inputJpg)
.tile({
@@ -907,7 +906,7 @@ describe('Tile', function () {
const container = fixtures.path('output.dz.container.zip');
const extractTo = fixtures.path('output.dz.container');
const directory = path.join(extractTo, 'output.dz.container_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.toFile(container, function (err, info) {
if (err) throw err;
@@ -934,7 +933,7 @@ describe('Tile', function () {
const container = fixtures.path('output.dz.containeropt.zip');
const extractTo = fixtures.path('output.dz.containeropt');
const directory = path.join(extractTo, 'output.dz.containeropt_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({
container: 'zip'
@@ -965,7 +964,7 @@ describe('Tile', function () {
const container = fixtures.path('output.dz.tiles.zip');
const extractTo = fixtures.path('output.dz.tiles');
const directory = path.join(extractTo, 'output.dz.tiles_files');
rimraf(directory, function () {
fs.rm(directory, { recursive: true }, function () {
sharp(fixtures.inputJpg)
.tile({ basename: 'output.dz.tiles' })
.toBuffer(function (err, data, info) {