errors: change ERR_HTTP2_HEADER_SINGLE_VALUE to TypeError

changes the base instance for ERR_HTTP2_HEADER_SINGLE_VALUE from Error to TypeError as a more accurate representation of the error. Additionally corrects the grammar of the error message. PR-URL: #19805 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
nodejs · Apr 12, 2018 · 1644a8a · 1644a8a
1 parent b74de4b
commit 1644a8a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -563,9 +563,8 @@ E('ERR_HTTP2_HEADERS_AFTER_RESPOND',
   'Cannot specify additional headers after response initiated', Error);
 E('ERR_HTTP2_HEADERS_SENT', 'Response has already been initiated.', Error);
 
-// This should probably be a `TypeError`.
 E('ERR_HTTP2_HEADER_SINGLE_VALUE',
-  'Header field "%s" must have only a single value', Error);
+  'Header field "%s" must only have a single value', TypeError);
 E('ERR_HTTP2_INFO_STATUS_NOT_ALLOWED',
   'Informational status codes cannot be used', RangeError);
 

diff --git a/lib/internal/http2/util.js b/lib/internal/http2/util.js
@@ -426,14 +426,14 @@ function mapToHeaders(map,
           break;
         default:
           if (isSingleValueHeader)
-            return new errors.Error('ERR_HTTP2_HEADER_SINGLE_VALUE', key);
+            return new errors.TypeError('ERR_HTTP2_HEADER_SINGLE_VALUE', key);
       }
     } else {
       value = String(value);
     }
     if (isSingleValueHeader) {
       if (singles.has(key))
-        return new errors.Error('ERR_HTTP2_HEADER_SINGLE_VALUE', key);
+        return new errors.TypeError('ERR_HTTP2_HEADER_SINGLE_VALUE', key);
       singles.add(key);
     }
     if (key[0] === ':') {

diff --git a/test/parallel/test-http2-multi-content-length.js b/test/parallel/test-http2-multi-content-length.js
@@ -31,8 +31,8 @@ server.listen(0, common.mustCall(() => {
       });
     }, {
       code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-      type: Error,
-      message: 'Header field "content-length" must have only a single value'
+      type: TypeError,
+      message: 'Header field "content-length" must only have a single value'
     }
   );
 

diff --git a/test/parallel/test-http2-single-headers.js b/test/parallel/test-http2-single-headers.js
@@ -31,17 +31,17 @@ server.listen(0, common.mustCall(() => {
       () => client.request({ [i]: 'abc', [i.toUpperCase()]: 'xyz' }),
       {
         code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-        type: Error,
-        message: `Header field "${i}" must have only a single value`
+        type: TypeError,
+        message: `Header field "${i}" must only have a single value`
       }
     );
 
     common.expectsError(
       () => client.request({ [i]: ['abc', 'xyz'] }),
       {
         code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-        type: Error,
-        message: `Header field "${i}" must have only a single value`
+        type: TypeError,
+        message: `Header field "${i}" must only have a single value`
       }
     );
   });

diff --git a/test/parallel/test-http2-util-headers-list.js b/test/parallel/test-http2-util-headers-list.js
@@ -177,8 +177,8 @@ const {
 
   common.expectsError({
     code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
-    type: Error,
-    message: 'Header field ":status" must have only a single value'
+    type: TypeError,
+    message: 'Header field ":status" must only have a single value'
   })(mapToHeaders(headers));
 }
 
@@ -223,7 +223,7 @@ const {
   HTTP2_HEADER_USER_AGENT,
   HTTP2_HEADER_X_CONTENT_TYPE_OPTIONS
 ].forEach((name) => {
-  const msg = `Header field "${name}" must have only a single value`;
+  const msg = `Header field "${name}" must only have a single value`;
   common.expectsError({
     code: 'ERR_HTTP2_HEADER_SINGLE_VALUE',
     message: msg