Merge remote-tracking branch 'origin/modernize'

.jshintrc

@@ -4,7 +4,6 @@
   "eqnull": true,
   "immed": true,
   "latedef": "nofunc",
-  "mocha" : true,
   "newcap": true,
   "noarg": true,
   "node": true,

Makefile

@@ -4,11 +4,12 @@ lint:
 	./node_modules/.bin/jshint *.js lib test
 
 test:
-	./node_modules/.bin/mocha \
-		--recursive \
-		--node-option no-experimental-fetch \
-		--require should \
-		--require test/replay \
-		--require isomorphic-fetch
-
-.PHONY: check lint test
+	node --test \
+		$(TEST_OPTS) \
+		--require ./test/replay/index.js
+
+test-cov: TEST_OPTS := --experimental-test-coverage
+test-cov: test
+
+.PHONY: check lint test test-cov
+

package.json

@@ -21,11 +21,10 @@
     "limiter-component": "~1"
   },
   "devDependencies": {
+    "@pirxpilot/jshint": "^3.1.0",
     "@pirxpilot/replay": "^2.2.1",
-    "isomorphic-fetch": "^3.0.0",
-    "jshint": "~2",
-    "mocha": "~10",
-    "should": "~13"
+    "chai": "~4",
+    "node-fetch": "~2"
   },
   "scripts": {
     "test": "make check"

test/geocode.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const furkotGeocode = require('../lib/geocode');
 
 /* global AbortController */
@@ -78,8 +79,7 @@ describe('furkot-geocode node module', function () {
     geocode.options.should.have.property('reverse').with.length(1);
   });
 
-  it('timeout', async function () {
-    this.slow(200);
+  it('timeout', { timeout: 200 }, async function () {
     const service = timeService(100);
     const geocode = furkotGeocode({
       forward: [
@@ -88,12 +88,13 @@ describe('furkot-geocode node module', function () {
       reverse: [],
       timeout: 50
     });
-    return geocode({}).should.be.rejectedWith({ cause: Symbol.for('timeout') });
+    return geocode({})
+      .then(() => should.fail('exception expected'))
+      .catch(err => err.should.have.property('cause', Symbol.for('timeout')));
   });
 
 
-  it('abort', async function () {
-    this.slow(200);
+  it('abort', { timeout: 200 }, async function () {
     const service = timeService(100);
     const geocode = furkotGeocode({
       forward: [
@@ -104,7 +105,9 @@ describe('furkot-geocode node module', function () {
     const ac = new AbortController();
     const p = geocode({}, { signal: ac.signal });
     ac.abort();
-    return p.should.be.rejectedWith({ name: 'AbortError' });
+    return p
+      .then(() => should.fail('exception expected'))
+      .catch(err => err.should.have.property('name', 'AbortError'));
   });
 
 

test/replay/index.js

@@ -1,3 +1,12 @@
+require('chai').should();
+
+const legacyFetch = require('node-fetch');
+
+globalThis.fetch = legacyFetch;
+globalThis.Response = legacyFetch.Response;
+globalThis.Headers = legacyFetch.Headers;
+globalThis.Request = legacyFetch.Request;
+
 const Replay = require('@pirxpilot/replay');
 Replay.fixtures = __dirname;
 

test/service/geocodio/index.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const geocodio = require('../../../lib/service/geocodio');
 
 describe('geocodio geocoding', function () {
@@ -15,7 +16,7 @@ describe('geocodio geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(2);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-87.12502, 39.52365],
       address: 'Brazil, IN',
       normal: 'Brazil,IN,US',
@@ -43,7 +44,7 @@ describe('geocodio geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(8);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-111.400596, 45.284265],
       address: '50 Big Sky Resort Rd, Big Sky, MT',
       normal: '50 Big Sky Resort Rd,Big Sky,MT,US',

test/service/graphhopper/index.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const graphhopper = require('../../../lib/service/graphhopper');
 
 describe('graphhopper geocoding', function () {
@@ -17,7 +18,7 @@ describe('graphhopper geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-46.8359735, -23.5370962],
       type: 'residential',
       street: 'Rua Cafelândia',
@@ -38,7 +39,7 @@ describe('graphhopper geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(4);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [18.65868924925842, 54.351528200000004],
       place: 'SS Sołdek',
       type: 'museum',
@@ -61,23 +62,23 @@ describe('graphhopper geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(5);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-73.1745473, 42.4750847],
       type: 'peak',
       country: 'USA',
       place: 'Main Street Cemetery',
       address: 'United States',
       normal: 'US'
     });
-    result.places[1].should.deepEqual({
+    result.places[1].should.deep.equal({
       ll: [-69.2728254, 44.8350646],
       type: 'dam',
       country: 'USA',
       place: 'Main Street Dam',
       address: 'United States',
       normal: 'US'
     });
-    result.places[2].should.deepEqual({
+    result.places[2].should.deep.equal({
       ll: [-71.086670478147, 42.36274665],
       type: 'construction',
       house: '325',
@@ -89,15 +90,15 @@ describe('graphhopper geocoding', function () {
       address: '325 Main Street, Cambridge, MA',
       normal: '325 Main Street,Cambridge,MA,US'
     });
-    result.places[3].should.deepEqual({
+    result.places[3].should.deep.equal({
       ll: [-71.6192199, 42.5524712],
       type: 'dam',
       country: 'USA',
       place: 'West Main Street Dam',
       address: 'United States',
       normal: 'US'
     });
-    result.places[4].should.deepEqual({
+    result.places[4].should.deep.equal({
       ll: [-10.6756677, 6.5080848],
       type: 'hamlet',
       province: 'Montserrado County',
@@ -116,7 +117,7 @@ describe('graphhopper geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(5);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [14.5268016, -22.6791826],
       place: 'Beryl\'s Restaurant',
       type: 'restaurant',
@@ -137,7 +138,7 @@ describe('graphhopper geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(5);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-111.40065600201527, 45.284264],
       type: 'yes',
       street: 'Black Eagle',
@@ -147,7 +148,7 @@ describe('graphhopper geocoding', function () {
       address: 'Black Eagle, MT',
       normal: 'Black Eagle,,MT,US'
     });
-    result.places[1].should.deepEqual({
+    result.places[1].should.deep.equal({
       ll: [-111.4011158, 45.2839783],
       type: 'sports_centre',
       house: '50',
@@ -159,7 +160,7 @@ describe('graphhopper geocoding', function () {
       address: '50 Big Sky Resort Road, Big Sky, MT',
       normal: '50 Big Sky Resort Road,Big Sky,MT,US'
     });
-    result.places[2].should.deepEqual({
+    result.places[2].should.deep.equal({
       ll: [-111.40110501870444, 45.284622],
       type: 'yes',
       street: 'Black Eagle',
@@ -169,7 +170,7 @@ describe('graphhopper geocoding', function () {
       address: 'Black Eagle, MT',
       normal: 'Black Eagle,,MT,US'
     });
-    result.places[3].should.deepEqual({
+    result.places[3].should.deep.equal({
       ll: [-111.4015212, 45.2842756],
       type: 'bicycle_rental',
       street: 'Mountain to Meadow',
@@ -180,7 +181,7 @@ describe('graphhopper geocoding', function () {
       address: 'Mountain to Meadow, Big Sky, MT',
       normal: 'Mountain to Meadow,Big Sky,MT,US'
     });
-    result.places[4].should.deepEqual({
+    result.places[4].should.deep.equal({
       ll: [-111.40158763890292, 45.284196300000005],
       type: 'yes',
       street: 'Mountain to Meadow',

test/service/hogfish/index.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const hogfish = require('../../../lib/service/hogfish');
 
 describe('hogfish geocoding', function () {
@@ -29,7 +30,7 @@ describe('hogfish geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-104.86063, 39.59278],
       place: 'Murphy Express',
       url: 'https://www.pure-gas.org/station?station_id=40499',
@@ -61,7 +62,7 @@ describe('hogfish geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-104.879164, 39.591416],
       place: 'Hyatt House Denver Tech Center',
       street: '9280 E Costilla Ave',

test/service/index.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const service = require('../../lib/service');
 
 describe('geocoding service', function () {
@@ -29,8 +30,7 @@ describe('geocoding service', function () {
   });
 });
 
-it('abort', async function () {
-  this.slow(200);
+it('abort', { timeout: 200 }, async function () {
   const { abort, geocode } = service({
     name: 'test',
     prepareRequest: () => ({}),
@@ -39,10 +39,11 @@ it('abort', async function () {
   const query = {};
   for (let queryId = 0; queryId < 3; queryId++) {
     abortAfter(queryId);
-    await geocode('forward', queryId, query).should.be.fulfilledWith(undefined);
+    const r = await geocode('forward', queryId, query);
+    should.not.exist(r);
   }
 
-  let result = await geocode('forward', 'after 3 aborts', query);
+  const result = await geocode('forward', 'after 3 aborts', query);
   should.not.exist(result);
 
   function abortAfter(queryId) {

test/service/locationiq/index.js

@@ -1,4 +1,5 @@
-const should = require('should');
+const { describe, it } = require('node:test');
+const should = require('chai').should();
 const locationiq = require('../../../lib/service/locationiq');
 
 describe('locationiq geocoding', function () {
@@ -17,7 +18,7 @@ describe('locationiq geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [-46.8359735, -23.5370962],
       type: 'road',
       address: 'Rua Cafelândia, Carapicuíba, São Paulo, Brazil',
@@ -38,7 +39,7 @@ describe('locationiq geocoding', function () {
     const result = await geocode('forward', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [18.658631239705393, 54.35145095],
       place: 'SS Sołdek',
       type: 'museum',
@@ -64,7 +65,7 @@ describe('locationiq geocoding', function () {
     const result = await geocode('forward', 10, query);
     should.exist(result);
     result.should.have.property('places').with.length(8);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       place: 'Hill Country Barbecue Market',
       type: 'restaurant',
       ll: [-73.9904326, 40.7442736],
@@ -76,7 +77,7 @@ describe('locationiq geocoding', function () {
       province: 'NY',
       country: 'USA'
     });
-    result.places[1].should.deepEqual({
+    result.places[1].should.deep.equal({
       place: 'Mapzen',
       type: 'disused',
       ll: [-73.9903515, 40.7442363],
@@ -88,7 +89,7 @@ describe('locationiq geocoding', function () {
       province: 'NY',
       country: 'USA'
     });
-    result.places[2].should.deepEqual({
+    result.places[2].should.deep.equal({
       place: 'Samsung Accelerator',
       type: 'company',
       ll: [-73.9903727, 40.7442104],
@@ -110,7 +111,7 @@ describe('locationiq geocoding', function () {
     const result = await geocode('reverse', 1, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       ll: [14.5268016, -22.6791826],
       place: 'Beryl\'s Restaurant',
       type: 'restaurant',
@@ -136,7 +137,7 @@ describe('locationiq geocoding', function () {
     const result = await geocode('forward', 10, query);
     should.exist(result);
     result.should.have.property('places').with.length(1);
-    result.places[0].should.deepEqual({
+    result.places[0].should.deep.equal({
       type: 'house_number',
       ll: [-104.999354, 39.676536],
       address: '2200 South Jason Street, Denver, CO',