Skip to content

Commit e771f9b

Browse files
committed
tests: Replace use of preq with node-fetch
Bug: T293853 Bug: T309772
1 parent 5c8fac8 commit e771f9b

File tree

3 files changed

+83
-73
lines changed

3 files changed

+83
-73
lines changed

package-lock.json

Lines changed: 72 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"homepage": "https://github.com/wikimedia/service-runner",
3333
"engines": {
34-
"node": ">=12"
34+
"node": ">=16"
3535
},
3636
"dependencies": {
3737
"bluebird": "^3.7.2",
@@ -58,7 +58,7 @@
5858
"eslint-config-wikimedia": "0.26.0",
5959
"mocha": "^10.2.0",
6060
"mocha-lcov-reporter": "^1.3.0",
61-
"nyc": "^15.1.0",
62-
"preq": "^0.5.14"
61+
"node-fetch": "^2.7.0",
62+
"nyc": "^15.1.0"
6363
}
6464
}

test/features/tests.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
'use strict';
22

3-
const preq = require( 'preq' );
4-
53
const TestServer = require( '../TestServer' );
64
const cluster = require( 'cluster' );
5+
const fetch = require( 'node-fetch' );
76
const assert = require( 'assert' );
87

98
describe( 'service-runner tests', () => {
@@ -103,18 +102,18 @@ describe( 'service-runner tests', () => {
103102
.finally( () => process.removeListener( 'warning', warningListener ) );
104103
} );
105104

106-
// preq prevents the AssertionErrors from surfacing and failing the test
105+
// fetch prevents the AssertionErrors from surfacing and failing the test
107106
// performing the test this way presents them correctly
108107
it( 'Must increment hitcount metrics when hit, no workers', () => {
109108
const server = new TestServer( `${ __dirname }/../utils/simple_config_no_workers.yaml` );
110109
const response = { status: null, body: null };
111110
return server.start()
112111
.then( () => {
113-
preq.get( { uri: 'http://127.0.0.1:12345' } );
112+
fetch( { uri: 'http://127.0.0.1:12345' } );
114113
} )
115114
.delay( 1000 )
116115
.then( () => {
117-
preq.get( { uri: 'http://127.0.0.1:9000' } )
116+
fetch( { uri: 'http://127.0.0.1:9000' } )
118117
.then( ( res ) => {
119118
response.status = res.status;
120119
response.body = res.body;
@@ -136,11 +135,11 @@ describe( 'service-runner tests', () => {
136135
const response = { status: null, body: null };
137136
return server.start()
138137
.then( () => {
139-
preq.get( { uri: 'http://127.0.0.1:12345' } );
138+
fetch( { uri: 'http://127.0.0.1:12345' } );
140139
} )
141140
.delay( 1000 )
142141
.then( () => {
143-
preq.get( { uri: 'http://127.0.0.1:9000' } )
142+
fetch( { uri: 'http://127.0.0.1:9000' } )
144143
.then( ( res ) => {
145144
response.status = res.status;
146145
response.body = res.body;
@@ -162,11 +161,11 @@ describe( 'service-runner tests', () => {
162161
const response = { status: null, body: null };
163162
return server.start()
164163
.then( () => {
165-
preq.get( { uri: 'http://127.0.0.1:12345' } );
164+
fetch( { uri: 'http://127.0.0.1:12345' } );
166165
} )
167166
.delay( 1000 )
168167
.then( () => {
169-
preq.get( { uri: 'http://127.0.0.1:9000' } )
168+
fetch( { uri: 'http://127.0.0.1:9000' } )
170169
.then( ( res ) => {
171170
response.status = res.status;
172171
response.body = res.body;

0 commit comments

Comments
 (0)