chore: lower devDeps, simplify test paths resolving

Signed-off-by: Charlike Mike Reagent <[email protected]>

Author: tunnckoCore

package.json

@@ -23,8 +23,6 @@
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-prettier": "^3.1.2",
-    "findit": "^0.1.2",
-    "hashish": "^0.0.4",
     "prettier": "^1.19.1",
     "prettier-plugin-pkgjson": "^0.2.0",
     "request": "^2.11.4",

test/common.js

@@ -4,44 +4,53 @@
 'use strict';
 
 const fs = require('fs');
+const net = require('net');
 const path = require('path');
 const http = require('http');
-const net = require('net');
 const assert = require('assert');
-const findit = require('findit');
-const hashish = require('hashish');
 
-const common = require('../common');
 const Formidable = require('../../src/index');
 
+const PORT = 13532;
+const CWD = process.cwd();
+const FIXTURES_PATH = path.join(CWD, 'test', 'fixture', 'js');
+const FIXTURES_HTTP = path.join(CWD, 'test', 'fixture', 'http');
+const UPLOAD_DIR = path.join(CWD, 'test', 'tmp');
+
 const server = http.createServer();
-server.listen(common.port, findFixtures);
+server.listen(PORT, findFixtures);
 
 function findFixtures() {
-  const fixtures = [];
-  findit.sync(path.join(common.dir.fixture, 'js')).forEach((jsPath) => {
-    if (!/\.js$/.test(jsPath) || /workarounds/.test(jsPath)) return;
-
-    const group = path.basename(jsPath, '.js');
-    hashish.forEach(require(jsPath), (fixture, name) => {
-      fixtures.push({
-        name: `${group}/${name}`,
-        fixture,
+  const results = fs
+    .readdirSync(FIXTURES_PATH)
+    .filter((x) => /\.js$/.test(x) && !/workarounds/.test(x))
+    .reduce((acc, fp) => {
+      const group = path.basename(fp, '.js');
+      const filepath = path.join(FIXTURES_PATH, fp);
+      const mod = require(filepath);
+
+      Object.keys(mod).forEach((k) => {
+        Object.keys(mod[k]).forEach((_fixture) => {
+          acc.push({
+            fixture: mod[k],
+            name: path.join(group, k),
+          });
+        });
       });
-    });
-  });
 
-  testNext(fixtures);
+      return acc;
+    }, []);
+
+  testNext(results);
 }
 
-function testNext(fixtures) {
-  let fixture = fixtures.shift();
+function testNext(results) {
+  let fixture = results.shift();
   if (!fixture) {
     server.close();
     return;
   }
   const fixtureName = fixture.name;
-
   fixture = fixture.fixture;
 
   uploadFixture(fixtureName, (err, parts) => {
@@ -62,15 +71,13 @@ function testNext(fixtures) {
       }
     });
 
-    testNext(fixtures);
+    testNext(results);
   });
 }
 
 function uploadFixture(fixtureName, cb) {
   server.once('request', (req, res) => {
-    const form = new Formidable();
-    form.uploadDir = common.dir.tmp;
-    form.hash = 'sha1';
+    const form = new Formidable({ uploadDir: UPLOAD_DIR, hash: 'sha1' });
     form.parse(req);
 
     function callback(...args) {
@@ -96,8 +103,8 @@ function uploadFixture(fixtureName, cb) {
       });
   });
 
-  const socket = net.createConnection(common.port);
-  const fixturePath = path.join(common.dir.fixture, 'http', fixtureName);
+  const socket = net.createConnection(PORT);
+  const fixturePath = path.join(FIXTURES_HTTP, fixtureName);
   const file = fs.createReadStream(fixturePath);
 
   file.pipe(socket, { end: false });

test/integration/test-fixtures.js

@@ -2,14 +2,14 @@
 
 const http = require('http');
 const assert = require('assert');
-const common = require('../common');
 const Formidable = require('../../src/index');
 
 const testData = {
   numbers: [1, 2, 3, 4, 5],
   nested: { key: 'value' },
 };
 
+const PORT = 13532;
 const server = http.createServer((req, res) => {
   const form = new Formidable();
 
@@ -21,11 +21,11 @@ const server = http.createServer((req, res) => {
   });
 });
 
-server.listen(common.port, (err) => {
+server.listen(PORT, (err) => {
   assert.equal(err, null);
 
   const request = http.request({
-    port: common.port,
+    port: PORT,
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

test/integration/test-json.js

@@ -7,9 +7,14 @@ const assert = require('assert');
 const hashish = require('hashish');
 
 const Formidable = require('../../src/index');
-const common = require('../common');
 
-const testFilePath = path.join(__dirname, '../fixture/file/binaryfile.tar.gz');
+const PORT = 13532;
+const testFilePath = path.join(
+  path.dirname(__dirname),
+  'fixture',
+  'file',
+  'binaryfile.tar.gz',
+);
 
 const server = http.createServer((req, res) => {
   const form = new Formidable();
@@ -30,11 +35,11 @@ const server = http.createServer((req, res) => {
   });
 });
 
-server.listen(common.port, (err) => {
+server.listen(PORT, (err) => {
   assert.equal(err, null);
 
   const request = http.request({
-    port: common.port,
+    port: PORT,
     method: 'POST',
     headers: {
       'Content-Type': 'application/octet-stream',

test/integration/test-octet-stream.js

@@ -1,13 +1,16 @@
 'use strict';
 
-const assert = require('assert');
+const path = require('path');
 const http = require('http');
-const common = require('../common');
+const assert = require('assert');
+
 const Formidable = require('../../src/index');
 
+const UPLOAD_DIR = path.join(process.cwd(), 'test', 'tmp');
+
 const server = http.createServer((req, res) => {
   const form = new Formidable();
-  form.uploadDir = common.dir.tmp;
+  form.uploadDir = UPLOAD_DIR;
   form.on('end', () => {
     throw new Error('Unexpected "end" event');
   });

test/standalone/test-content-transfer-encoding.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const http = require('http');
-const request = require('request');
 const assert = require('assert');
+const request = require('request');
 const Formidable = require('../../src/index');
 
 const host = 'localhost';

test/standalone/test-issue-46.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const assert = require('assert');
-const http = require('http');
 const net = require('net');
+const http = require('http');
+const assert = require('assert');
 const Formidable = require('../../src/index');
 
 let ok = 0;

test/standalone/test-keep-alive-error.js

@@ -1,13 +1,13 @@
 'use strict';
 
+const assert = require('assert');
 const test = require('utest');
-const common = require('../common');
 
-const { assert } = common;
-const File = common.require('file');
+const { File } = require('../../src/file');
 
 let file;
 const now = new Date();
+
 test('IncomingForm', {
   before() {
     file = new File({

test/unit/test-file.js

@@ -5,12 +5,12 @@
 const path = require('path');
 const assert = require('assert');
 const Request = require('http').ClientRequest;
-const test = require('utest');
-const common = require('../common');
 
-const { IncomingForm } = common.require('incoming_form');
+const test = require('utest');
+const { IncomingForm } = require('../../src/incoming_form');
 
 let form;
+
 test('IncomingForm', {
   before() {
     form = new IncomingForm();

test/unit/test-incoming-form.js

@@ -210,13 +210,6 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-"chainsaw@>=0.0.7 <0.1":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e"
-  integrity sha1-EaBRAtHEx4W20EFdM21aOhYSkT4=
-  dependencies:
-    traverse ">=0.3.0 <0.4"
-
 chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -667,13 +660,6 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-findit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/findit/-/findit-0.1.2.tgz#ac7fe600cd6a32a35672836b74cf6f1dde2e11f8"
-  integrity sha1-rH/mAM1qMqNWcoNrdM9vHd4uEfg=
-  dependencies:
-    seq ">=0.1.7"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -809,13 +795,6 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-"hashish@>=0.0.2 <0.1", hashish@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
-  integrity sha1-bWC8b/r3Ebav1g5CbQd5iAFOZVQ=
-  dependencies:
-    traverse ">=0.2.4"
-
 hosted-git-info@^2.1.4:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
@@ -1472,14 +1451,6 @@ semver@^6.1.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-seq@>=0.1.7:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
-  integrity sha1-rgKvOkJHk9jMvyEtaRdODFTf/jg=
-  dependencies:
-    chainsaw ">=0.0.7 <0.1"
-    hashish ">=0.0.2 <0.1"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -1680,16 +1651,6 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-traverse@>=0.2.4:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
-
-"traverse@>=0.3.0 <0.4":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
-
 tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"