tests: Replace use of preq with native fetch

jdforrester · mvolz · commit 2ff83aed9f0b · 2024-12-12T15:58:52.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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 )

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@`
`58`	`58`	`"eslint-config-wikimedia": "0.28.2",`
`59`	`59`	`"mocha": "^10.2.0",`
`60`	`60`	`"mocha-lcov-reporter": "^1.3.0",`
`61`		`- "nyc": "^15.1.0",`
`62`		`- "preq": "^0.5.14"`
	`61`	`+ "nyc": "^15.1.0"`
`63`	`62`	`}`
`64`	`63`	`}`