Use assert.rejects

Author: jdalton

test/socket-cdxgen.test.ts

@@ -1,33 +1,40 @@
 import assert from 'node:assert/strict'
-import { spawnSync } from 'node:child_process'
 import { describe, it } from 'node:test'
 
+import spawn from '@npmcli/promise-spawn'
+
 import { distPath } from './dist/constants'
 
-import type { SpawnSyncOptionsWithStringEncoding } from 'node:child_process'
+type PromiseSpawnOptions = Exclude<Parameters<typeof spawn>[2], undefined> & {
+  encoding?: BufferEncoding | undefined
+}
 
-const spawnOpts: SpawnSyncOptionsWithStringEncoding = {
+const spawnOpts: PromiseSpawnOptions = {
   cwd: distPath,
   encoding: 'utf8'
 }
 
 describe('Socket cdxgen command', async () => {
   it('should forwards known commands to cdxgen', async () => {
     for (const command of ['-h', '--help']) {
-      const ret = spawnSync('./cli.js', ['cdxgen', command], spawnOpts)
-      assert(ret.stdout.startsWith('cdxgen'), 'forwards commands to cdxgen')
+      // eslint-disable-next-line no-await-in-loop
+      const ret = await spawn('./cli.js', ['cdxgen', command], spawnOpts)
+      assert.ok(ret.stdout.startsWith('cdxgen'), 'forwards commands to cdxgen')
     }
   })
   it('should not forward unknown commands to cdxgen', async () => {
     for (const command of ['-u', '--unknown']) {
-      const ret = spawnSync('./cli.js', ['cdxgen', command], spawnOpts)
-      assert(ret.stderr.startsWith(`Unknown argument: ${command}`), 'singular')
+      // eslint-disable-next-line no-await-in-loop
+      await assert.rejects(
+        () => spawn('./cli.js', ['cdxgen', command], spawnOpts),
+        e => e?.['stderr']?.startsWith(`Unknown argument: ${command}`),
+        'singular'
+      )
     }
-    const ret = spawnSync(
-      './cli.js',
-      ['cdxgen', '-u', '-h', '--unknown'],
-      spawnOpts
+    await assert.rejects(
+      () => spawn('./cli.js', ['cdxgen', '-u', '-h', '--unknown'], spawnOpts),
+      e => e?.['stderr']?.startsWith('Unknown arguments: -u, --unknown'),
+      'plural'
     )
-    assert(ret.stderr.startsWith('Unknown arguments: -u, --unknown'), 'plural')
   })
 })

test/socket-npm.test.cjs

@@ -30,24 +30,19 @@ for (const npm of ['npm8', 'npm10']) {
 
   describe(`Socket npm wrapper for ${npm}`, () => {
     it('should bail on new typosquat', async () => {
-      try {
-        await spawn(
-          process.execPath,
-          [entryPath, 'npm', 'install', 'bowserify'],
-          {
+      await assert.rejects(
+        () =>
+          spawn(process.execPath, [entryPath, 'npm', 'install', 'bowserify'], {
             cwd: path.join(npmFixturesPath, 'lacking-typosquat'),
             encoding: 'utf8',
             env: {
               // Make sure we don't borrow TTY from parent.
               SOCKET_SECURITY_TTY_IPC: undefined,
               PATH: `${npmBinPath}:${process.env.PATH}`
             }
-          }
-        )
-        assert.ok(false, 'typosquat not error')
-      } catch (e) {
-        assert.ok(e?.stderr.includes('Unable to prompt'), e?.stderr)
-      }
+          }),
+        e => e?.stderr.includes('Unable to prompt')
+      )
     })
   })
 }