Skip to content

Commit f0916ca

Browse files
larissayvetteMylesBorins
authored andcommitted
test: refactor test-http-after-connect.js
- Replace assert.equal() to assert.strictEqual() - Replace var with const where applicable - Removed firstBodyChunk which is never used - Remove the process.on('exit', ...) and replace its functionality by - Using common.mustCall() where applicable PR-URL: #10229 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Italo A. Casas <me@italoacasas.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 58c8647 commit f0916ca

1 file changed

Lines changed: 13 additions & 23 deletions

File tree

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,62 @@
11
'use strict';
2-
require('../common');
3-
varassert=require('assert');
4-
varhttp=require('http');
2+
constcommon=require('../common');
3+
constassert=require('assert');
4+
consthttp=require('http');
55

6-
varserverConnected=false;
7-
varserverRequests=0;
86
varclientResponses=0;
97

10-
varserver=http.createServer(function(req,res){
8+
constserver=http.createServer(common.mustCall(function(req,res){
119
console.error('Server got GET request');
1210
req.resume();
13-
++serverRequests;
1411
res.writeHead(200);
1512
res.write('');
1613
setTimeout(function(){
1714
res.end(req.url);
1815
},50);
19-
});
20-
server.on('connect',function(req,socket,firstBodyChunk){
16+
},2));
17+
server.on('connect',common.mustCall(function(req,socket){
2118
console.error('Server got CONNECT request');
22-
serverConnected=true;
2319
socket.write('HTTP/1.1 200 Connection established\r\n\r\n');
2420
socket.resume();
2521
socket.on('end',function(){
2622
socket.end();
2723
});
28-
});
24+
}));
2925
server.listen(0,function(){
30-
varreq=http.request({
26+
constreq=http.request({
3127
port: this.address().port,
3228
method: 'CONNECT',
3329
path: 'google.com:80'
3430
});
35-
req.on('connect',function(res,socket,firstBodyChunk){
31+
req.on('connect',common.mustCall(function(res,socket){
3632
console.error('Client got CONNECT response');
3733
socket.end();
3834
socket.on('end',function(){
3935
doRequest(0);
4036
doRequest(1);
4137
});
4238
socket.resume();
43-
});
39+
}));
4440
req.end();
4541
});
4642

4743
functiondoRequest(i){
4844
http.get({
4945
port: server.address().port,
5046
path: '/request'+i
51-
},function(res){
47+
},common.mustCall(function(res){
5248
console.error('Client got GET response');
5349
vardata='';
5450
res.setEncoding('utf8');
5551
res.on('data',function(chunk){
5652
data+=chunk;
5753
});
5854
res.on('end',function(){
59-
assert.equal(data,'/request'+i);
55+
assert.strictEqual(data,'/request'+i);
6056
++clientResponses;
6157
if(clientResponses===2){
6258
server.close();
6359
}
6460
});
65-
});
61+
}));
6662
}
67-
68-
process.on('exit',function(){
69-
assert(serverConnected);
70-
assert.equal(serverRequests,2);
71-
assert.equal(clientResponses,2);
72-
});

0 commit comments

Comments
 (0)