scratch-storage 2.2.1 → 2.3.1

package/test/integration/download-known-assets.test.js

@@ -0,0 +1,141 @@
+const md5 = require('js-md5');
+
+const ScratchStorage = require('../../src/index.js');
+
+test('constructor', () => {
+    const storage = new ScratchStorage();
+    expect(storage).toBeInstanceOf(ScratchStorage);
+});
+
+/**
+ * @typedef {object} AssetTestInfo
+ * @property {AssetType} type - The type of the asset.
+ * @property {string} id - The asset's unique ID.
+ * @property {string} md5 - The asset's MD5 hash.
+ * @property {DataFormat} [ext] - Optional: the asset's data format / file extension.
+ */
+
+/**
+ * @param {ScratchStorage} storage The storage module.
+ * @returns {AssetTestInfo[]} an array of asset info objects.
+ */
+const getTestAssets = storage => [
+    // Project
+    {
+        type: storage.AssetType.Project,
+        id: '117504922',
+        md5: '1225460702e149727de28bff4cfd9e23'
+    },
+    // SVG without explicit extension
+    {
+        type: storage.AssetType.ImageVector,
+        id: 'f88bf1935daea28f8ca098462a31dbb0', // cat1-a
+        md5: 'f88bf1935daea28f8ca098462a31dbb0'
+    },
+    // SVG with explicit extension
+    {
+        type: storage.AssetType.ImageVector,
+        id: '6e8bd9ae68fdb02b7e1e3df656a75635', // cat1-b
+        md5: '6e8bd9ae68fdb02b7e1e3df656a75635',
+        ext: storage.DataFormat.SVG
+    },
+    // PNG without explicit extension
+    {
+        type: storage.AssetType.ImageBitmap,
+        id: '7e24c99c1b853e52f8e7f9004416fa34', // squirrel
+        md5: '7e24c99c1b853e52f8e7f9004416fa34'
+    },
+    // PNG with explicit extension
+    {
+        type: storage.AssetType.ImageBitmap,
+        id: '66895930177178ea01d9e610917f8acf', // bus
+        md5: '66895930177178ea01d9e610917f8acf',
+        ext: storage.DataFormat.PNG
+    },
+    // JPG with explicit extension
+    {
+        type: storage.AssetType.ImageBitmap,
+        id: 'fe5e3566965f9de793beeffce377d054', // building at MIT
+        md5: 'fe5e3566965f9de793beeffce377d054',
+        ext: storage.DataFormat.JPG
+    },
+    // WAV without explicit extension
+    {
+        type: storage.AssetType.Sound,
+        id: '83c36d806dc92327b9e7049a565c6bff', // meow
+        md5: '83c36d806dc92327b9e7049a565c6bff' // wat
+    }
+];
+
+const addWebStores = storage => {
+    // these `asset => ...` callbacks generate values specifically for the cross-fetch mock
+    // in the real world they would generate proper URIs
+    storage.addWebStore(
+        [storage.AssetType.Project],
+        asset => asset.assetId,
+        null, null);
+    storage.addWebStore(
+        [storage.AssetType.ImageVector, storage.AssetType.ImageBitmap, storage.AssetType.Sound],
+        asset => `${asset.assetId}.${asset.dataFormat}`,
+        null, null
+    );
+};
+
+test('addWebStore', () => {
+    const storage = new ScratchStorage();
+    addWebStores(storage);
+    expect(storage.webHelper.stores.length).toBe(2);
+});
+
+test('load', () => {
+    const storage = new ScratchStorage();
+    addWebStores(storage);
+    const testAssets = getTestAssets(storage);
+    const assetChecks = testAssets.map(async assetInfo => {
+        const asset = await storage.load(assetInfo.type, assetInfo.id, assetInfo.ext)
+            .catch(e => {
+                if (e instanceof Array) {
+                    // This is storage.load reporting one or more errors from individual tools.
+                    e = e.flat();
+
+                    if (e.length === 1) {
+                        // If we just have one, it'll display well as-is. Don't bother wrapping it.
+                        // Note that this still might be either an Error or a status code (see below).
+                        e = e[0];
+                    }
+                }
+
+                if (e instanceof Array) {
+                    /* global AggregateError */
+                    // we must have >1 error, so report it as an AggregateError (supported in Node 15+)
+                    e = new AggregateError(
+                        e.flat(),
+                        `failed to load ${assetInfo.type.name} asset with id=${assetInfo.id}`
+                    );
+                    // Jest doesn't display AggregateError very well on its own
+                    console.error(e);
+                } else if (!(e instanceof Error)) {
+                    // storage.load can throw a status like 403 or 500 which isn't an Error.
+                    // That can look confusing in test output, so wrap it in an Error that will display well.
+                    e = new Error(`failed to load ${assetInfo.type.name} asset with id=${assetInfo.id} (e=${e})`);
+                }
+                // else it's an Error that's already suitable for reporting
+
+                throw e;
+            });
+        expect(asset).toBeInstanceOf(storage.Asset);
+        expect(asset.assetId).toBe(assetInfo.id);
+        expect(asset.assetType).toBe(assetInfo.type);
+        expect(asset.data.length).toBeGreaterThan(0);
+
+        // Web assets should come back as clean
+        expect(asset.clean).toBeTruthy();
+
+        if (assetInfo.md5) {
+            // eslint-disable-next-line jest/no-conditional-expect
+            expect(md5(asset.data)).toBe(assetInfo.md5);
+        }
+    });
+
+    return Promise.all(assetChecks);
+});

package/test/transformers/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+    extends: ['scratch/es6', 'plugin:jest/recommended'],
+    env: {
+        jest: true,
+        node: true
+    },
+    plugins: ['jest']
+};

package/test/transformers/arraybuffer-loader.js

@@ -0,0 +1,11 @@
+const fs = require('fs');
+
+module.exports = {
+    process (_sourceText, sourcePath) {
+        const buffer = fs.readFileSync(sourcePath);
+        const array = buffer.toJSON().data;
+        return {
+            code: `module.exports = Buffer.from([${array}]);`
+        };
+    }
+};

package/test/unit/{add-helper.js → add-helper.test.js}

@@ -1,6 +1,4 @@
-const test = require('tap').test;
-
-const ScratchStorage = require('../../dist/node/scratch-storage');
+const ScratchStorage = require('../../src');
 
 /**
  * Simulate a storage helper, adding log messages when "load" is called rather than actually loading anything.
@@ -36,20 +34,18 @@ class LoggingHelper {
     }
 }
 
-test('ScratchStorage constructor', t => {
+test('ScratchStorage constructor', () => {
     const storage = new ScratchStorage();
-    t.type(storage, ScratchStorage);
-    t.end();
+    expect(storage).toBeInstanceOf(ScratchStorage);
 });
 
-test('LoggingHelper constructor', t => {
+test('LoggingHelper constructor', () => {
     const storage = new ScratchStorage();
     const loggingHelper = new LoggingHelper(storage, 'constructor test', true, []);
-    t.type(loggingHelper, LoggingHelper);
-    t.end();
+    expect(loggingHelper).toBeInstanceOf(LoggingHelper);
 });
 
-test('addHelper', t => {
+test('addHelper', async () => {
     const logContainer = [];
     const storage = new ScratchStorage();
 
@@ -69,17 +65,17 @@ test('addHelper', t => {
     storage.addHelper(loggingHelpers[1], 0);
 
     // Did they all get added?
-    t.equal(storage._helpers.length, initialHelperCount + loggingHelpers.length);
+    expect(storage._helpers.length).toBe(initialHelperCount + loggingHelpers.length);
 
     // We shouldn't have any log entries yet
-    t.deepEqual(logContainer, []);
+    expect(logContainer).toStrictEqual([]);
+
+    await storage.load(storage.AssetType.Project, '0');
 
-    return storage.load(storage.AssetType.Project, '0').then(() => {
-        // Verify that all helpers were consulted, and in the correct order
-        t.deepEqual(logContainer, [
-            'first',
-            'second',
-            'third'
-        ]);
-    });
+    // Verify that all helpers were consulted, and in the correct order
+    expect(logContainer).toStrictEqual([
+        'first',
+        'second',
+        'third'
+    ]);
 });

package/test/unit/fetch-tool.test.js

@@ -0,0 +1,56 @@
+const TextDecoder = require('util').TextDecoder;
+
+jest.mock('cross-fetch');
+const mockFetch = require('cross-fetch');
+const FetchTool = require('../../src/FetchTool.js');
+
+test('send success returns response.text()', async () => {
+    const tool = new FetchTool();
+
+    const result = await tool.send({url: '200'});
+    expect(result).toBe(mockFetch.successText);
+});
+
+test('send failure returns response.status', async () => {
+    const tool = new FetchTool();
+
+    const catcher = jest.fn();
+
+    try {
+        await tool.send({url: '500'});
+    } catch (e) {
+        catcher(e);
+    }
+
+    expect(catcher).toHaveBeenCalledWith(500);
+});
+
+test('get success returns Uint8Array.body(response.arrayBuffer())', async () => {
+    const encoding = 'utf-8';
+    const decoder = new TextDecoder(encoding);
+
+    const tool = new FetchTool();
+
+    const result = await tool.get({url: '200'});
+    expect(decoder.decode(result)).toBe(mockFetch.successText);
+});
+
+test('get with 404 response returns null data', async () => {
+    const tool = new FetchTool();
+
+    const result = await tool.get({url: '404'});
+    expect(result).toBeNull();
+});
+
+test('get failure returns response.status', async () => {
+    const tool = new FetchTool();
+    const catcher = jest.fn();
+
+    try {
+        await tool.get({url: '500'});
+    } catch (e) {
+        catcher(e);
+    }
+
+    expect(catcher).toHaveBeenCalledWith(500);
+});

package/test/unit/load-default-assets.test.js

@@ -0,0 +1,67 @@
+const md5 = require('js-md5');
+
+const ScratchStorage = require('../../dist/node/scratch-storage');
+
+// Hash and file size of each default asset
+const knownSizes = {
+    '8e768a5a5a01891b05c01c9ca15eb6aa': 255,
+    'b586745b98e94d7574f7f7b48d831e20': 46,
+    'e5cb3b2aa4e1a9b4c735c3415e507e66': 925
+};
+
+const getDefaultAssetTypes = storage => {
+    const defaultAssetTypes = [storage.AssetType.ImageBitmap, storage.AssetType.ImageVector, storage.AssetType.Sound];
+    return defaultAssetTypes;
+};
+
+const getDefaultAssetIds = (storage, defaultAssetTypes) => {
+    const defaultIds = {};
+    for (const assetType of defaultAssetTypes) {
+        const id = storage.getDefaultAssetId(assetType);
+        defaultIds[assetType.name] = id;
+    }
+    return defaultIds;
+};
+
+test('constructor', () => {
+    const storage = new ScratchStorage();
+    expect(storage).toBeInstanceOf(ScratchStorage);
+});
+
+test('getDefaultAssetId', () => {
+    const storage = new ScratchStorage();
+    const defaultAssetTypes = getDefaultAssetTypes(storage);
+    const defaultIds = getDefaultAssetIds(storage, defaultAssetTypes);
+    for (const assetType of defaultAssetTypes) {
+        const id = defaultIds[assetType.name];
+        expect(typeof id).toBe('string');
+    }
+});
+
+test('load', () => {
+    const storage = new ScratchStorage();
+    const defaultAssetTypes = getDefaultAssetTypes(storage);
+    const defaultIds = getDefaultAssetIds(storage, defaultAssetTypes);
+
+    const promises = [];
+    const checkAsset = (assetType, id, asset) => {
+        expect(asset).toBeInstanceOf(storage.Asset);
+        expect(asset.assetId).toStrictEqual(id);
+        expect(asset.assetType).toStrictEqual(assetType);
+        expect(asset.data.length).toBeTruthy();
+        expect(asset.data.length).toBe(knownSizes[id]);
+        expect(md5(asset.data)).toBe(id);
+    };
+    for (const assetType of defaultAssetTypes) {
+        const id = defaultIds[assetType.name];
+
+        const promise = storage.load(assetType, id);
+        expect(promise).toBeInstanceOf(Promise);
+
+        const checkedPromise = promise.then(asset => checkAsset(assetType, id, asset));
+
+        promises.push(checkedPromise);
+    }
+
+    return Promise.all(promises);
+});

package/test/unit/metadata.test.js

@@ -0,0 +1,129 @@
+jest.mock('cross-fetch');
+
+beforeEach(() => {
+    // reset the metadata container to ensure the tests don't interfere with each other
+    // but this also means we need to `require` inside the tests
+    /* eslint-disable global-require */
+    jest.resetModules();
+
+    // temporary: pretend we're running in a browser and the URL has scratchMetadata=1
+    // this is a hack to enable the metadata feature in tests
+    // see also `hasMetadata` in scratchFetch.js
+    global.self = global.self || {};
+    global.self.location = new URL('https://example.com/?scratchMetadata=1');
+});
+
+test('get without metadata', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const tool = new FetchTool();
+
+    const mockFetchTestData = {};
+    const result = await tool.get({url: '200', mockFetchTestData});
+
+    expect(result).toBeInstanceOf(Uint8Array);
+    expect(mockFetchTestData.headers).toBeTruthy();
+    expect(mockFetchTestData.headersCount).toBe(0);
+});
+
+test('get with metadata', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const ScratchFetch = require('../../src/scratchFetch');
+    const {RequestMetadata, setMetadata} = ScratchFetch;
+
+    const tool = new FetchTool();
+
+    setMetadata(RequestMetadata.ProjectId, 1234);
+    setMetadata(RequestMetadata.RunId, 5678);
+
+    const mockFetchTestData = {};
+    const result = await tool.get({url: '200', mockFetchTestData});
+
+    expect(result).toBeInstanceOf(Uint8Array);
+    expect(mockFetchTestData.headers).toBeTruthy();
+    expect(mockFetchTestData.headersCount).toBe(2);
+    expect(mockFetchTestData.headers?.get(RequestMetadata.ProjectId)).toBe('1234');
+    expect(mockFetchTestData.headers?.get(RequestMetadata.RunId)).toBe('5678');
+});
+
+test('send without metadata', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const tool = new FetchTool();
+
+    const mockFetchTestData = {};
+    const result = await tool.send({url: '200', mockFetchTestData});
+
+    expect(typeof result).toBe('string');
+    expect(mockFetchTestData.headers).toBeTruthy();
+    expect(mockFetchTestData.headersCount).toBe(0);
+});
+
+test('send with metadata', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const ScratchFetch = require('../../src/scratchFetch');
+    const {RequestMetadata, setMetadata} = ScratchFetch;
+
+    const tool = new FetchTool();
+
+    setMetadata(RequestMetadata.ProjectId, 4321);
+    setMetadata(RequestMetadata.RunId, 8765);
+
+    const mockFetchTestData = {};
+    const result = await tool.send({url: '200', mockFetchTestData});
+
+    expect(typeof result).toBe('string');
+    expect(mockFetchTestData.headers).toBeTruthy();
+    expect(mockFetchTestData.headersCount).toBe(2);
+    expect(mockFetchTestData.headers?.get(RequestMetadata.ProjectId)).toBe('4321');
+    expect(mockFetchTestData.headers?.get(RequestMetadata.RunId)).toBe('8765');
+});
+
+test('selectively delete metadata', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const ScratchFetch = require('../../src/scratchFetch');
+    const {RequestMetadata, setMetadata, unsetMetadata} = ScratchFetch;
+
+    // verify that these special values are preserved and not interpreted as "delete"
+    setMetadata(RequestMetadata.ProjectId, null);
+    setMetadata(RequestMetadata.RunId, void 0); // void 0 = undefined
+
+    const tool = new FetchTool();
+
+    const mockFetchTestData = {};
+
+    const result1 = await tool.send({url: '200', mockFetchTestData});
+    expect(typeof result1).toBe('string');
+    expect(mockFetchTestData.headers).toBeTruthy();
+
+    expect(mockFetchTestData.headersCount).toBe(2);
+    expect(mockFetchTestData.headers?.get(RequestMetadata.ProjectId)).toBe('null'); // string "null" means it's present
+    expect(mockFetchTestData.headers?.get(RequestMetadata.RunId)).toBe('undefined');
+
+    // remove the Project ID from metadata
+    unsetMetadata(RequestMetadata.ProjectId);
+
+    const result2 = await tool.send({url: '200', mockFetchTestData});
+    expect(typeof result2).toBe('string');
+    expect(mockFetchTestData.headers).toBeTruthy();
+
+    expect(mockFetchTestData.headersCount).toBe(1);
+    expect(mockFetchTestData.headers?.get(RequestMetadata.ProjectId)).toBeNull(); // value `null` means it's present
+    expect(mockFetchTestData.headers?.get(RequestMetadata.RunId)).toBe('undefined');
+});
+
+test('metadata has case-insensitive keys', async () => {
+    const FetchTool = require('../../src/FetchTool.js');
+    const ScratchFetch = require('../../src/scratchFetch');
+    const {setMetadata} = ScratchFetch;
+
+    setMetadata('foo', 1);
+    setMetadata('FOO', 2);
+
+    const tool = new FetchTool();
+
+    const mockFetchTestData = {};
+    await tool.get({url: '200', mockFetchTestData});
+
+    expect(mockFetchTestData.headers).toBeTruthy();
+    expect(mockFetchTestData.headersCount).toBe(1);
+    expect(mockFetchTestData.headers?.get('foo')).toBe('2');
+});

package/webpack.config.js

@@ -24,6 +24,10 @@ const base = {
                     // @babel/plugin-transform-runtime with CommonJS files.
                     sourceType: 'unambiguous'
                 }
+            },
+            {
+                test: /\.(png|svg|wav)$/,
+                loader: 'arraybuffer-loader'
             }
         ]
     },

package/.nyc_output/f1105466-7461-4f73-8b18-ee824eb652b1.json

@@ -1 +0,0 @@
-{}

package/.nyc_output/fd8f05df-43a0-4695-b45d-f4877b37f387.json

@@ -1 +0,0 @@
-{}

package/.nyc_output/processinfo/f1105466-7461-4f73-8b18-ee824eb652b1.json

@@ -1 +0,0 @@
-{"parent":null,"pid":257,"argv":["/usr/local/bin/node","/home/circleci/project/node_modules/.bin/tap","./test/integration/download-known-assets.js"],"execArgv":[],"cwd":"/home/circleci/project","time":1680278197547,"ppid":246,"coverageFilename":"/home/circleci/project/.nyc_output/f1105466-7461-4f73-8b18-ee824eb652b1.json","externalId":"","uuid":"f1105466-7461-4f73-8b18-ee824eb652b1","files":[]}

package/.nyc_output/processinfo/fd8f05df-43a0-4695-b45d-f4877b37f387.json

@@ -1 +0,0 @@
-{"parent":"f1105466-7461-4f73-8b18-ee824eb652b1","pid":268,"argv":["/usr/local/bin/node","/home/circleci/project/test/integration/download-known-assets.js"],"execArgv":[],"cwd":"/home/circleci/project","time":1680278198785,"ppid":257,"coverageFilename":"/home/circleci/project/.nyc_output/fd8f05df-43a0-4695-b45d-f4877b37f387.json","externalId":"./test/integration/download-known-assets.js","uuid":"fd8f05df-43a0-4695-b45d-f4877b37f387","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +0,0 @@
-{"processes":{"f1105466-7461-4f73-8b18-ee824eb652b1":{"parent":null,"children":["fd8f05df-43a0-4695-b45d-f4877b37f387"]},"fd8f05df-43a0-4695-b45d-f4877b37f387":{"parent":"f1105466-7461-4f73-8b18-ee824eb652b1","externalId":"./test/integration/download-known-assets.js","children":[]}},"files":{},"externalIds":{"./test/integration/download-known-assets.js":{"root":"fd8f05df-43a0-4695-b45d-f4877b37f387","children":[]}}}

package/test/integration/download-known-assets.js

@@ -1,111 +0,0 @@
-const md5 = require('js-md5');
-const test = require('tap').test;
-
-const ScratchStorage = require('../../dist/node/scratch-storage');
-
-let storage;
-test('constructor', t => {
-    storage = new ScratchStorage();
-    t.type(storage, ScratchStorage);
-    t.end();
-});
-
-/**
- *
- * @type {AssetTestInfo[]}
- * @typedef {object} AssetTestInfo
- * @property {AssetType} type - The type of the asset.
- * @property {string} id - The asset's unique ID.
- * @property {string} md5 - The asset's MD5 hash.
- * @property {DataFormat} [ext] - Optional: the asset's data format / file extension.
- */
-const testAssets = [
-    // TODO: mock project download, since we can no longer download projects directly
-    // {
-    //     type: storage.AssetType.Project,
-    //     id: '117504922',
-    //     md5: null // don't check MD5 for project without revision ID
-    // },
-    // {
-    //     type: storage.AssetType.Project,
-    //     id: '117504922.d6ae1ffb76f2bc83421cd3f40fc4fd57',
-    //     md5: '1225460702e149727de28bff4cfd9e23'
-    // },
-    {
-        type: storage.AssetType.ImageVector,
-        id: 'f88bf1935daea28f8ca098462a31dbb0', // cat1-a
-        md5: 'f88bf1935daea28f8ca098462a31dbb0'
-    },
-    {
-        type: storage.AssetType.ImageVector,
-        id: '6e8bd9ae68fdb02b7e1e3df656a75635', // cat1-b
-        md5: '6e8bd9ae68fdb02b7e1e3df656a75635',
-        ext: storage.DataFormat.SVG
-    },
-    {
-        type: storage.AssetType.ImageBitmap,
-        id: '7e24c99c1b853e52f8e7f9004416fa34', // squirrel
-        md5: '7e24c99c1b853e52f8e7f9004416fa34'
-    },
-    {
-        type: storage.AssetType.ImageBitmap,
-        id: '66895930177178ea01d9e610917f8acf', // bus
-        md5: '66895930177178ea01d9e610917f8acf',
-        ext: storage.DataFormat.PNG
-    },
-    {
-        type: storage.AssetType.ImageBitmap,
-        id: 'fe5e3566965f9de793beeffce377d054', // building at MIT
-        md5: 'fe5e3566965f9de793beeffce377d054',
-        ext: storage.DataFormat.JPG
-    },
-    {
-        type: storage.AssetType.Sound,
-        id: '83c36d806dc92327b9e7049a565c6bff', // meow
-        md5: '83c36d806dc92327b9e7049a565c6bff' // wat
-    }
-];
-
-test('addWebStore', t => {
-    t.doesNotThrow(() => {
-        storage.addWebStore(
-            [storage.AssetType.Project],
-            asset => {
-                const idParts = asset.assetId.split('.');
-                return idParts[1] ?
-                    `https://cdn.projects.scratch.mit.edu/internalapi/project/${idParts[0]}/get/${idParts[1]}` :
-                    `https://cdn.projects.scratch.mit.edu/internalapi/project/${idParts[0]}/get/`;
-            });
-    });
-    t.doesNotThrow(() => {
-        storage.addWebStore(
-            [storage.AssetType.ImageVector, storage.AssetType.ImageBitmap, storage.AssetType.Sound],
-            asset => `https://cdn.assets.scratch.mit.edu/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`
-        );
-    });
-    t.end();
-});
-
-test('load', t => {
-    const assetChecks = testAssets.map(async assetInfo => {
-        const asset = await storage.load(assetInfo.type, assetInfo.id, assetInfo.ext)
-            .catch(e => {
-                // tap's output isn't great if we just let it catch the unhandled promise rejection
-                // wrapping it like this makes a failure much easier to read in the test output
-                throw new Error(`failed to load ${assetInfo.type.name} asset with id=${assetInfo.id} (e=${e})`);
-            });
-        t.type(asset, storage.Asset);
-        t.equal(asset.assetId, assetInfo.id);
-        t.equal(asset.assetType, assetInfo.type);
-        t.ok(asset.data.length);
-
-        // Web assets should come back as clean
-        t.ok(asset.clean);
-
-        if (assetInfo.md5) {
-            t.equal(md5(asset.data), assetInfo.md5);
-        }
-    });
-
-    return Promise.all(assetChecks);
-});

package/test/unit/fetch-tool.js

@@ -1,57 +0,0 @@
-const tap = require('tap');
-const TextDecoder = require('util').TextDecoder;
-
-const mockFetch = require('../mocks/mock-fetch.js');
-
-/**
- * This is the real FetchTool, but the 'cross-fetch' module has been replaced with the mockFetch function.
- * @type {typeof import('../../src/FetchTool')}
- */
-const FetchTool = tap.mock('../../src/FetchTool', {
-    'cross-fetch': mockFetch
-});
-
-tap.test('send success returns response.text()', t => {
-    const tool = new FetchTool();
-
-    return t.resolves(
-        tool.send({url: '200'}).then(result => {
-            t.equal(result, mockFetch.successText);
-        })
-    );
-});
-
-tap.test('send failure returns response.status', t => {
-    const tool = new FetchTool();
-
-    return t.rejects(tool.send({url: '500'}), 500);
-});
-
-tap.test('get success returns Uint8Array.body(response.arrayBuffer())', t => {
-    const encoding = 'utf-8';
-    const decoder = new TextDecoder(encoding);
-
-    const tool = new FetchTool();
-
-    return t.resolves(
-        tool.get({url: '200'}).then(result => {
-            t.equal(decoder.decode(result), mockFetch.successText);
-        })
-    );
-});
-
-tap.test('get with 404 response returns null data', t => {
-    const tool = new FetchTool();
-
-    return t.resolves(
-        tool.get({url: '404'}).then(result => {
-            t.equal(result, null);
-        })
-    );
-});
-
-tap.test('get failure returns response.status', t => {
-    const tool = new FetchTool();
-
-    return t.rejects(tool.get({url: '500'}), 500);
-});