aboutsummaryrefslogtreecommitdiff
path: root/test/parallel/test-http-default-port.js
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2017-12-09 05:56:22 +0100
committerAnatoli Papirovski <apapirovski@mac.com>2017-12-11 19:49:49 -0500
commitc84ca17305964905c99d16066cb56d6950e30256 (patch)
treebcfcad1f325ceef5c59ebb7b7c4d6f5db174966c /test/parallel/test-http-default-port.js
parentec6c063279b4cd4d85dcc0ac7b223c10982b6e77 (diff)
downloadandroid-node-v8-c84ca17305964905c99d16066cb56d6950e30256.tar.gz
android-node-v8-c84ca17305964905c99d16066cb56d6950e30256.tar.bz2
android-node-v8-c84ca17305964905c99d16066cb56d6950e30256.zip
test: refactor test-http-default-port
- Remove redundant `hasCrypto` checks - Use `common.mustCall()` - Use arrow functions - Deduplicate HTTP & HTTPS code PR-URL: https://github.com/nodejs/node/pull/17562 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jon Moss <me@jonathanmoss.me> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Diffstat (limited to 'test/parallel/test-http-default-port.js')
-rw-r--r--test/parallel/test-http-default-port.js55
1 files changed, 14 insertions, 41 deletions
diff --git a/test/parallel/test-http-default-port.js b/test/parallel/test-http-default-port.js
index 0b3530e76c..a5af439a8e 100644
--- a/test/parallel/test-http-default-port.js
+++ b/test/parallel/test-http-default-port.js
@@ -34,54 +34,27 @@ const options = {
key: fixtures.readKey('agent1-key.pem'),
cert: fixtures.readKey('agent1-cert.pem')
};
-let gotHttpsResp = false;
-let gotHttpResp = false;
-process.on('exit', function() {
- if (common.hasCrypto) {
- assert(gotHttpsResp);
- }
- assert(gotHttpResp);
- console.log('ok');
-});
-
-http.createServer(function(req, res) {
- assert.strictEqual(req.headers.host, hostExpect);
- assert.strictEqual(req.headers['x-port'], this.address().port.toString());
- res.writeHead(200);
- res.end('ok');
- this.close();
-}).listen(0, function() {
- http.globalAgent.defaultPort = this.address().port;
- http.get({
- host: 'localhost',
- headers: {
- 'x-port': this.address().port
- }
- }, function(res) {
- gotHttpResp = true;
- res.resume();
- });
-});
-
-if (common.hasCrypto) {
- https.createServer(options, function(req, res) {
+for (const { mod, createServer } of [
+ { mod: http, createServer: http.createServer },
+ { mod: https, createServer: https.createServer.bind(null, options) }
+]) {
+ const server = createServer(common.mustCall((req, res) => {
assert.strictEqual(req.headers.host, hostExpect);
- assert.strictEqual(req.headers['x-port'], this.address().port.toString());
+ assert.strictEqual(req.headers['x-port'], `${server.address().port}`);
res.writeHead(200);
res.end('ok');
- this.close();
- }).listen(0, function() {
- https.globalAgent.defaultPort = this.address().port;
- https.get({
+ server.close();
+ })).listen(0, common.mustCall(() => {
+ mod.globalAgent.defaultPort = server.address().port;
+ mod.get({
host: 'localhost',
rejectUnauthorized: false,
headers: {
- 'x-port': this.address().port
+ 'x-port': server.address().port
}
- }, function(res) {
- gotHttpsResp = true;
+ }, common.mustCall((res) => {
res.resume();
- });
- });
+ }));
+ }));
}