diff --git a/package-lock.json b/package-lock.json index 99dbe27..8651a8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,8 +33,7 @@ "eslint-config-wikimedia": "0.28.2", "mocha": "^10.2.0", "mocha-lcov-reporter": "^1.3.0", - "nyc": "^15.1.0", - "preq": "^0.5.14" + "nyc": "^15.1.0" }, "engines": { "node": ">=20" @@ -1580,9 +1579,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.52", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz", - "integrity": "sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ==", + "version": "1.5.53", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.53.tgz", + "integrity": "sha512-7F6qFMWzBArEFK4PLE+c+nWzhS1kIoNkQvGnNDogofxQAym+roQ0GUIdw6C/4YdJ6JKGp19c2a/DLcfKTi4wRQ==", "dev": true }, "node_modules/emoji-regex": { @@ -4450,20 +4449,6 @@ "node": ">= 0.8.0" } }, - "node_modules/preq": { - "version": "0.5.14", - "resolved": "https://registry.npmjs.org/preq/-/preq-0.5.14.tgz", - "integrity": "sha512-kuJ5ndEgjs27kTTQ/P2ipPQoHeCJcAI4i97mU3xSjkjx6CsuQOsCe2l5twTGC0SCB5UkzRpmrpXmvN0Ip4ZCxA==", - "dev": true, - "dependencies": { - "bluebird": "^3.5.5", - "request": "^2.88.0", - "requestretry": "4.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -4763,20 +4748,6 @@ "uuid": "bin/uuid" } }, - "node_modules/requestretry": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-4.0.2.tgz", - "integrity": "sha512-ZGdO1ZXUQAeCB9xOS2keSN501y7T1t0zPOD58jTAOwamt6qkcBMaGdRBHEOMQRnDtT5fn7S99F0dwADUqCmYqg==", - "dev": true, - "dependencies": { - "extend": "^3.0.2", - "lodash": "^4.17.10", - "when": "^3.7.7" - }, - "peerDependencies": { - "request": "2.*.*" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5504,12 +5475,6 @@ "eslint": ">=6.0.0" } }, - "node_modules/when": { - "version": "3.7.8", - "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz", - "integrity": "sha512-5cZ7mecD3eYcMiCH4wtRPA5iFJZ50BJYDfckI5RRpQiktMiYTcn0ccLTZOvcbBume+1304fQztxeNzNS9Gvrnw==", - "dev": true - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 13cbf9b..16e4b98 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "eslint-config-wikimedia": "0.28.2", "mocha": "^10.2.0", "mocha-lcov-reporter": "^1.3.0", - "nyc": "^15.1.0", - "preq": "^0.5.14" + "nyc": "^15.1.0" } } diff --git a/test/features/tests.js b/test/features/tests.js index 9116df4..d78ab4d 100644 --- a/test/features/tests.js +++ b/test/features/tests.js @@ -1,7 +1,5 @@ 'use strict'; -const preq = require( 'preq' ); - const TestServer = require( '../TestServer' ); const cluster = require( 'cluster' ); const assert = require( 'assert' ); @@ -109,15 +107,18 @@ describe( 'service-runner tests', () => { const server = new TestServer( `${ __dirname }/../utils/simple_config_no_workers.yaml` ); const response = { status: null, body: null }; return server.start() - .then( () => { - preq.get( { uri: 'http://127.0.0.1:12345' } ); + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:12345' ); } ) .delay( 1000 ) - .then( () => { - preq.get( { uri: 'http://127.0.0.1:9000' } ) - .then( ( res ) => { + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:9000' ) + .then( async ( res ) => { response.status = res.status; - response.body = res.body; + // This is a ReadableStream of a Uint8Array, but we just want the string + response.body = new TextDecoder().decode( await res.arrayBuffer() ); } ); } ) .delay( 1000 ) @@ -135,15 +136,18 @@ describe( 'service-runner tests', () => { const server = new TestServer( `${ __dirname }/../utils/simple_config_one_worker.yaml` ); const response = { status: null, body: null }; return server.start() - .then( () => { - preq.get( { uri: 'http://127.0.0.1:12345' } ); + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:12345' ); } ) .delay( 1000 ) - .then( () => { - preq.get( { uri: 'http://127.0.0.1:9000' } ) - .then( ( res ) => { + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:9000' ) + .then( async ( res ) => { response.status = res.status; - response.body = res.body; + // This is a ReadableStream of a Uint8Array, but we just want the string + response.body = new TextDecoder().decode( await res.arrayBuffer() ); } ); } ) .delay( 1000 ) @@ -161,15 +165,18 @@ describe( 'service-runner tests', () => { const server = new TestServer( `${ __dirname }/../utils/simple_config_two_workers.yaml` ); const response = { status: null, body: null }; return server.start() - .then( () => { - preq.get( { uri: 'http://127.0.0.1:12345' } ); + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:12345' ); } ) .delay( 1000 ) - .then( () => { - preq.get( { uri: 'http://127.0.0.1:9000' } ) - .then( ( res ) => { + .then( async () => { + // eslint-disable-next-line n/no-unsupported-features/node-builtins + await fetch( 'http://127.0.0.1:9000' ) + .then( async ( res ) => { response.status = res.status; - response.body = res.body; + // This is a ReadableStream of a Uint8Array, but we just want the string + response.body = new TextDecoder().decode( await res.arrayBuffer() ); } ); } ) .delay( 1000 )