Fix Windows test failures by catching spawn promises immediately

Author: jdalton

test/agent.test.ts

@@ -473,9 +473,9 @@ describe('agent', () => {
     describe('execNpm argument transformation', () => {
       it('should have a function that returns a promise', () => {
         const result = execNpm(['--version'])
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should be a function', () => {
@@ -486,9 +486,9 @@ describe('agent', () => {
     describe('execPnpm argument transformation', () => {
       it('should have a function that returns a promise', () => {
         const result = execPnpm(['--version'])
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should be a function', () => {
@@ -499,9 +499,9 @@ describe('agent', () => {
     describe('execYarn argument transformation', () => {
       it('should have a function that returns a promise', () => {
         const result = execYarn(['--version'])
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should be a function', () => {
@@ -512,9 +512,9 @@ describe('agent', () => {
     describe('execScript argument transformation', () => {
       it('should have a function that returns a promise', () => {
         const result = execScript('test')
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should be a function', () => {
@@ -523,25 +523,25 @@ describe('agent', () => {
 
       it('should handle script name with array args', () => {
         const result = execScript('test', ['--coverage'])
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should handle script name with options object', () => {
         const result = execScript('test', { cwd: process.cwd() })
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
 
       it('should handle script name with args and options', () => {
         const result = execScript('test', ['--coverage'], {
           cwd: process.cwd(),
         })
-        expect(result).toBeInstanceOf(Promise)
-        // Catch promise to prevent unhandled rejection on Windows.
+        // Catch promise immediately to prevent unhandled rejection on Windows.
         result.catch(() => {})
+        expect(result).toBeInstanceOf(Promise)
       })
     })
   })

test/dlx-binary.test.ts

@@ -140,17 +140,19 @@ describe('dlx-binary', () => {
             name: 'cached-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result1.spawnPromise.catch(() => {})
           expect(result1.downloaded).toBe(true)
 
           // Second call - should use cache
           const result2 = await dlxBinary(['--version'], {
             name: 'cached-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result2.spawnPromise.catch(() => {})
           expect(result2.downloaded).toBe(false)
           expect(result2.binaryPath).toBe(result1.binaryPath)
-          await result1.spawnPromise.catch(() => {})
-          await result2.spawnPromise.catch(() => {})
         } finally {
           restoreHome()
         }
@@ -326,6 +328,8 @@ describe('dlx-binary', () => {
             name: 'ttl-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result.spawnPromise.catch(() => {})
 
           expect(result.downloaded).toBe(true)
 
@@ -338,10 +342,10 @@ describe('dlx-binary', () => {
             name: 'ttl-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result2.spawnPromise.catch(() => {})
 
           expect(result2.downloaded).toBe(true)
-          await result.spawnPromise.catch(() => {})
-          await result2.spawnPromise.catch(() => {})
         } finally {
           restoreHome()
         }
@@ -1109,16 +1113,18 @@ describe('dlx-binary', () => {
             name: 'concurrent-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result1.spawnPromise.catch(() => {})
           expect(result1.downloaded).toBe(true)
 
           // Second download should use cache
           const result2 = await dlxBinary(['--version'], {
             name: 'concurrent-binary',
             url,
           })
+          // Catch spawn promise immediately to prevent unhandled rejection on Windows.
+          result2.spawnPromise.catch(() => {})
           expect(result2.downloaded).toBe(false)
-          await result1.spawnPromise.catch(() => {})
-          await result2.spawnPromise.catch(() => {})
         } finally {
           restoreHome()
         }