fixup: test

test/parallel/test-http-outgoing-proto.js

@@ -74,41 +74,33 @@ assert.throws(() => {
   );
 }
 
-assert(!OutgoingMessage.prototype.write.call({ _header: 'test' }));
-
-{
-  const expectedError = {
-    code: 'ERR_INVALID_ARG_TYPE',
-    name: 'TypeError',
-    message: 'The "chunk" argument must be of type string or an instance of ' +
-            'Buffer or Uint8Array. Received undefined'
-  };
+assert.throws(() => {
   const outgoingMessage = new OutgoingMessage();
-  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' }, undefined,
-                             common.expectsError(expectedError));
-}
+  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' });
+}, {
+  code: 'ERR_INVALID_ARG_TYPE',
+  name: 'TypeError',
+  message: 'The first argument must be of type string or an instance of ' +
+           'Buffer. Received undefined'
+});
 
-{
-  const expectedError = {
-    code: 'ERR_INVALID_ARG_TYPE',
-    name: 'TypeError',
-    message: 'The "chunk" argument must be of type string or an instance of ' +
-            'Buffer or Uint8Array. Received type number (1)'
-  };
+assert.throws(() => {
   const outgoingMessage = new OutgoingMessage();
-  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' }, 1,
-                             common.expectsError(expectedError));
-}
+  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' }, 1);
+}, {
+  code: 'ERR_INVALID_ARG_TYPE',
+  name: 'TypeError',
+  message: 'The first argument must be of type string or an instance of ' +
+           'Buffer. Received type number (1)'
+});
 
-{
-  const expectedError = {
-    code: 'ERR_STREAM_NULL_VALUES',
-    name: 'TypeError',
-  };
+assert.throws(() => {
   const outgoingMessage = new OutgoingMessage();
-  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' }, null,
-                             common.expectsError(expectedError));
-}
+  outgoingMessage.write.call({ _header: 'test', _hasBody: 'test' }, null);
+}, {
+  code: 'ERR_STREAM_NULL_VALUES',
+  name: 'TypeError'
+});
 
 // addTrailers()
 // The `Error` comes from the JavaScript engine so confirm that it is a

test/parallel/test-http-res-write-end-dont-take-array.js

@@ -21,85 +21,53 @@
 
 'use strict';
 const common = require('../common');
+const assert = require('assert');
 const http = require('http');
 
-{
-  const server = http.createServer();
+const server = http.createServer();
 
-  server.once('request', common.mustCall((req, res) => {
-    // `res.write()` should accept `string`.
-    res.write('string');
-    // `res.write()` should accept `buffer`.
-    res.write(Buffer.from('asdf'));
-
-    const expectedError = {
-      code: 'ERR_INVALID_ARG_TYPE',
-      name: 'TypeError',
-    };
-
-    // `res.write()` should not accept an Array.
-    res.write(['array'], common.expectsError(expectedError));
-    res.on('error', common.expectsError(expectedError));
-    res.on('error', () => {
-      res.destroy();
-      server.close();
-    });
+server.once('request', common.mustCall((req, res) => {
+  server.on('request', common.mustCall((req, res) => {
+    res.end(Buffer.from('asdf'));
   }));
+  // `res.write()` should accept `string`.
+  res.write('string');
+  // `res.write()` should accept `buffer`.
+  res.write(Buffer.from('asdf'));
 
-  server.listen(0, function() {
-    http.get({ port: this.address().port }, (res) => {
-      res.resume();
-    });
-  });
-}
-
-// TODO(ronag): end doesn't always call callback
-// {
-//   const server = http.createServer();
+  const expectedError = {
+    code: 'ERR_INVALID_ARG_TYPE',
+    name: 'TypeError',
+  };
 
-//   server.once('request', common.mustCall((req, res) => {
-//     // `res.write()` should accept `string`.
-//     res.write('string');
-//     // `res.write()` should accept `buffer`.
-//     res.write(Buffer.from('asdf'));
+  // `res.write()` should not accept an Array.
+  assert.throws(
+    () => {
+      res.write(['array']);
+    },
+    expectedError
+  );
 
-//     const expectedError = {
-//       code: 'ERR_INVALID_ARG_TYPE',
-//       name: 'TypeError',
-//     };
+  // `res.end()` should not accept an Array.
+  assert.throws(
+    () => {
+      res.end(['moo']);
+    },
+    expectedError
+  );
 
-//     // `res.end()` should not accept an Array.
-//     res.end(['array'], common.expectsError(expectedError));
-//     res.on('error', common.expectsError(expectedError));
-//     res.on('error', () => {
-//       res.destroy();
-//       server.close();
-//     });
-//   }));
+  // `res.end()` should accept `string`.
+  res.end('string');
+}));
 
-//   server.listen(0, function() {
-//     // Just make a request, other tests handle responses.
-//     http.get({ port: this.address().port }, (res) => {
-//       res.resume();
-//     });
-//   });
-// }
-
-{
-  const server = http.createServer();
-
-  server.once('request', common.mustCall((req, res) => {
-    // `res.end()` should accept `Buffer`.
-    res.end(Buffer.from('asdf'), () => {
-      res.destroy();
-      server.close();
-    });
-  }));
-
-  server.listen(0, function() {
-    // Just make a request, other tests handle responses.
-    http.get({ port: this.address().port }, (res) => {
+server.listen(0, function() {
+  // Just make a request, other tests handle responses.
+  http.get({ port: this.address().port }, (res) => {
+    res.resume();
+    // Do it again to test .end(Buffer);
+    http.get({ port: server.address().port }, (res) => {
       res.resume();
+      server.close();
     });
   });
-}
+});