test: improve test-http-allow-req-after-204-res

edsadr · MylesBorins · commit 28a5ce10af09 · 2017-01-31T20:04:30.000-05:00
* use const instead of var * use common.mustCall to control functions execution * use assert.strictEqual instead of assert.equal * use arrow functions PR-URL: #10503 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Italo A. Casas <me@italoacasas.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Prince John Wesley <princejohnwesley@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/test/parallel/test-http-allow-req-after-204-res.js b/test/parallel/test-http-allow-req-after-204-res.js
@@ -1,45 +1,42 @@
 'use strict';
-require('../common');
-var http = require('http');
-var assert = require('assert');
+const common = require('../common');
+const http = require('http');
+const assert = require('assert');
 
 // first 204 or 304 works, subsequent anything fails
-var codes = [204, 200];
+const codes = [204, 200];
 
 // Methods don't really matter, but we put in something realistic.
-var methods = ['DELETE', 'DELETE'];
+const methods = ['DELETE', 'DELETE'];
 
-var server = http.createServer(function(req, res) {
-  var code = codes.shift();
-  assert.equal('number', typeof code);
+const server = http.createServer(common.mustCall((req, res) => {
+  const code = codes.shift();
+  assert.strictEqual(typeof code, 'number');
   assert.ok(code > 0);
-  console.error('writing %d response', code);
   res.writeHead(code, {});
   res.end();
-});
+}, codes.length));
 
 function nextRequest() {
-  var method = methods.shift();
-  console.error('writing request: %s', method);
+  const method = methods.shift();
 
-  var request = http.request({
+  const request = http.request({
     port: server.address().port,
     method: method,
     path: '/'
-  }, function(response) {
-    response.on('end', function() {
+  }, common.mustCall((response) => {
+    response.on('end', common.mustCall(() => {
       if (methods.length === 0) {
-        console.error('close server');
         server.close();
       } else {
         // throws error:
         nextRequest();
         // works just fine:
         //process.nextTick(nextRequest);
       }
-    });
+    }));
     response.resume();
-  });
+  }));
   request.end();
 }
 
