summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian White <mscdex@mscdex.net>2019-08-18 23:24:49 -0400
committerRich Trott <rtrott@gmail.com>2019-08-21 22:21:19 -0700
commit775048d54c6f190cbc8c0b55c0b53d2ba9d4d028 (patch)
treef81a4147406ece0e3aeefc97a04e98591e5bcf2f
parent6afd1a3dc183eb0edfde878df7a655cc58caece4 (diff)
downloadandroid-node-v8-775048d54c6f190cbc8c0b55c0b53d2ba9d4d028.tar.gz
android-node-v8-775048d54c6f190cbc8c0b55c0b53d2ba9d4d028.tar.bz2
android-node-v8-775048d54c6f190cbc8c0b55c0b53d2ba9d4d028.zip
buffer: correct concat() error message
PR-URL: https://github.com/nodejs/node/pull/29198 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
-rw-r--r--lib/buffer.js2
-rw-r--r--test/parallel/test-buffer-concat.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/buffer.js b/lib/buffer.js
index 7f33bcab5e..7753e3239f 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -525,7 +525,7 @@ Buffer.concat = function concat(list, length) {
// TODO(BridgeAR): This should not be of type ERR_INVALID_ARG_TYPE.
// Instead, find the proper error code for this.
throw new ERR_INVALID_ARG_TYPE(
- `list[${i}]`, ['Array', 'Buffer', 'Uint8Array'], list[i]);
+ `list[${i}]`, ['Buffer', 'Uint8Array'], list[i]);
}
_copy(buf, buffer, pos);
pos += buf.length;
diff --git a/test/parallel/test-buffer-concat.js b/test/parallel/test-buffer-concat.js
index 7ef5b9cd35..6be3a39fa0 100644
--- a/test/parallel/test-buffer-concat.js
+++ b/test/parallel/test-buffer-concat.js
@@ -59,7 +59,7 @@ assert.strictEqual(flatLongLen.toString(), check);
Buffer.concat(value);
}, {
code: 'ERR_INVALID_ARG_TYPE',
- message: 'The "list[0]" argument must be one of type Array, Buffer, ' +
+ message: 'The "list[0]" argument must be one of type Buffer ' +
`or Uint8Array. Received type ${typeof value[0]}`
});
});
@@ -68,7 +68,7 @@ assert.throws(() => {
Buffer.concat([Buffer.from('hello'), 3]);
}, {
code: 'ERR_INVALID_ARG_TYPE',
- message: 'The "list[1]" argument must be one of type Array, Buffer, ' +
+ message: 'The "list[1]" argument must be one of type Buffer ' +
'or Uint8Array. Received type number'
});