Fix EBADPLATFORM error message (#1876)

* Fix EBADPLATFORM error message Error format evolved out from under message generation's expectations. * Fix formatting
npm · Sep 29, 2020 · 405e051 · 405e051
1 parent 9bc6966
commit 405e051
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/lib/utils/error-message.js b/lib/utils/error-message.js
@@ -220,8 +220,12 @@ module.exports = (er) => {
       break
 
     case 'EBADPLATFORM': {
-      const validOs = er.os.join ? er.os.join(',') : er.os
-      const validArch = er.cpu.join ? er.cpu.join(',') : er.cpu
+      const validOs = er.required &&
+        er.required.os &&
+        er.required.os.join ? er.required.os.join(',') : er.required.os
+      const validArch = er.required &&
+        er.required.cpu &&
+        er.required.cpu.join ? er.required.cpu.join(',') : er.required.cpu
       const expected = { os: validOs, arch: validArch }
       const actual = { os: process.platform, arch: process.arch }
       short.push([

diff --git a/tap-snapshots/test-lib-utils-error-message.js-TAP.test.js b/tap-snapshots/test-lib-utils-error-message.js-TAP.test.js
@@ -161,7 +161,7 @@ Object {
   "summary": Array [
     Array [
       "notsup",
-      "Unsupported platform for undefined: wanted {\\"os\\":\\"!yours,mine\\",\\"arch\\":\\"x420,x69\\"} (current: {\\"os\\":\\"posix\\",\\"arch\\":\\"x64\\"})",
+      "Unsupported platform for lodash@1.0.0: wanted {\\"os\\":\\"!yours,mine\\",\\"arch\\":\\"x420,x69\\"} (current: {\\"os\\":\\"posix\\",\\"arch\\":\\"x64\\"})",
     ],
   ],
 }
@@ -178,7 +178,7 @@ Object {
   "summary": Array [
     Array [
       "notsup",
-      "Unsupported platform for undefined: wanted {\\"os\\":\\"!yours\\",\\"arch\\":\\"x420\\"} (current: {\\"os\\":\\"posix\\",\\"arch\\":\\"x64\\"})",
+      "Unsupported platform for lodash@1.0.0: wanted {\\"os\\":\\"!yours\\",\\"arch\\":\\"x420\\"} (current: {\\"os\\":\\"posix\\",\\"arch\\":\\"x64\\"})",
     ],
   ],
 }

diff --git a/test/lib/utils/error-message.js b/test/lib/utils/error-message.js
@@ -406,17 +406,31 @@ t.test('404', t => {
 t.test('bad platform', t => {
   t.test('string os/arch', t => {
     const er = Object.assign(new Error('a bad plat'), {
-      os: '!yours',
-      cpu: 'x420',
+      pkgid: 'lodash@1.0.0',
+      current: {
+        os: 'posix',
+        cpu: 'x64'
+      },
+      required: {
+        os: '!yours',
+        cpu: 'x420'
+      },
       code: 'EBADPLATFORM'
     })
     t.matchSnapshot(errorMessage(er))
     t.end()
   })
   t.test('array os/arch', t => {
     const er = Object.assign(new Error('a bad plat'), {
-      os: ['!yours', 'mine'],
-      cpu: ['x420', 'x69'],
+      pkgid: 'lodash@1.0.0',
+      current: {
+        os: 'posix',
+        cpu: 'x64'
+      },
+      required: {
+        os: ['!yours', 'mine'],
+        cpu: ['x420', 'x69']
+      },
       code: 'EBADPLATFORM'
     })
     t.matchSnapshot(errorMessage(er))