remove fetch-mock

Mika- · Jun 28, 2024 · ecc87f2 · ecc87f2
1 parent 0e0c99d
commit ecc87f2
Show file tree

Hide file tree

Showing 12 changed files with 869 additions and 990 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,11 +14,11 @@
     "@types/chai": "^4.2.12",
     "@types/chrome": "^0.0.268",
     "@types/mocha": "^10.0.1",
+    "@types/sinon": "^17.0.3",
     "chai": "^5.1.0",
-    "fetch-mock": "^9.10.4",
     "jsdom": "^24.0.0",
     "mocha": "^10.0.0",
-    "node-fetch": "^2.6.5",
+    "sinon": "^18.0.0",
     "sinon-chrome": "^3.0.1",
     "web-ext": "^8.2.0"
   }

diff --git a/test/env.js b/test/env.js
@@ -1,4 +1,5 @@
 import {expect} from 'chai';
+import sinon from 'sinon';
 import chrome from 'sinon-chrome';
 import JSDOM from 'jsdom';
 
@@ -9,3 +10,19 @@ const jsdom = new JSDOM.JSDOM();
 global.DOMParser = jsdom.window.DOMParser;
 global.FileReader = jsdom.window.FileReader;
 global.Headers = jsdom.window.Headers;
+
+global.FormData = class FormData {
+    append(name, value) {
+        this[name] = value;
+    }
+    get (name) {
+        return this[name];
+    }
+};
+
+export const mochaHooks = {
+    afterEach() {
+        sinon.restore();
+        chrome.flush();
+    },
+};
diff --git a/test/helpers.js b/test/helpers.js
@@ -1,10 +1,10 @@
-import fsPromises from 'fs/promises';
+import { promises } from 'node:fs';
 import JSDOM from 'jsdom';
 
 export const getTestTorrent = async () => {
     const jsdom = new JSDOM.JSDOM();
 
-    return new jsdom.window.Blob([await fsPromises.readFile('./test/test.torrent')], {
+    return new jsdom.window.Blob([await promises.readFile('./test/test.torrent')], {
         type: 'application/x-bittorrent',
     });
 }

diff --git a/test/lib/cloudtorrent.test.js b/test/lib/cloudtorrent.test.js
@@ -1,9 +1,9 @@
-import fetchMock from 'fetch-mock';
-
+import sinon from 'sinon';
 import {getTestTorrent} from '../helpers.js';
 import CloudTorrentApi from '../../src/lib/cloudtorrent.js';
 
 describe('CloudTorrentApi', () => {
+    /** @type {CloudTorrentApi} */
     let instance;
 
     before(() => {
@@ -14,11 +14,6 @@ describe('CloudTorrentApi', () => {
         });
     });
 
-    afterEach(() => {
-        chrome.flush();
-        fetchMock.reset();
-    });
-
     it('Login', async () => {
         await instance.logIn();
 
@@ -78,35 +73,46 @@ describe('CloudTorrentApi', () => {
     });
 
     it('Add torrent', async () => {
-        fetchMock.postOnce('https://example.com:1234/api/torrentfile', {
+        const fetchStub = sinon.stub(global, 'fetch');
+
+        fetchStub.resolves({
+            ok: true,
             status: 200,
-            body: 'OK',
+            text: () => Promise.resolve('OK'),
         });
 
         const torrentFile = await getTestTorrent();
 
         await instance.addTorrent(torrentFile);
 
-        expect(fetchMock.calls().length).to.equal(1);
-        expect(fetchMock.lastOptions().method).to.equal('POST');
-        expect(fetchMock.lastOptions().body).to.equal(torrentFile);
+        expect(fetchStub.calledOnce).to.equal(true);
+        expect(fetchStub.lastCall.args[0]).to.equal('https://example.com:1234/api/torrentfile');
+        expect(fetchStub.lastCall.args[1].method).to.equal('POST');
+        expect(fetchStub.lastCall.args[1].body).to.equal(torrentFile);
     });
 
     it('Add torrent url', async () => {
-        fetchMock.postOnce('https://example.com:1234/api/magnet', {
+        const fetchStub = sinon.stub(global, 'fetch');
+
+        fetchStub.resolves({
+            ok: true,
             status: 200,
-            body: 'OK',
+            text: () => Promise.resolve('OK'),
         });
 
         await instance.addTorrentUrl('https://example.com/test.torrent', {});
 
-        expect(fetchMock.calls().length).to.equal(1);
-        expect(fetchMock.lastOptions().method).to.equal('POST');
-        expect(fetchMock.lastOptions().body).to.equal('https://example.com/test.torrent');
+        expect(fetchStub.calledOnce).to.equal(true);
+        expect(fetchStub.lastCall.args[0]).to.equal('https://example.com:1234/api/magnet');
+        expect(fetchStub.lastCall.args[1].method).to.equal('POST');
+        expect(fetchStub.lastCall.args[1].body).to.equal('https://example.com/test.torrent');
     });
 
     it('Add torrent url fail', async () => {
-        fetchMock.postOnce('https://example.com:1234/api/magnet', {
+        const fetchStub = sinon.stub(global, 'fetch');
+
+        fetchStub.resolves({
+            ok: false,
             status: 400,
         });
 
@@ -116,8 +122,9 @@ describe('CloudTorrentApi', () => {
             expect(e).to.be.a('Error');
         }
 
-        expect(fetchMock.calls().length).to.equal(1);
-        expect(fetchMock.lastOptions().method).to.equal('POST');
-        expect(fetchMock.lastOptions().body).to.equal('https://example.com/not_a_torrent_file');
+        expect(fetchStub.calledOnce).to.equal(true);
+        expect(fetchStub.lastCall.args[0]).to.equal('https://example.com:1234/api/magnet');
+        expect(fetchStub.lastCall.args[1].body).to.equal('https://example.com/not_a_torrent_file');
+        expect(fetchStub.lastCall.args[1].method).to.equal('POST');
     });
 });