chore: improvements from test nits

Author: Jeff Wainwright

__tests__/application/respond.test.js

@@ -561,7 +561,8 @@ describe('app.respond', () => {
       const app = new Koa()
 
       app.use(async ctx => {
-        ctx.body = new Blob(['hello']).stream()
+        const blob = new Blob(['hello'])
+        ctx.body = blob.stream()
       })
 
       return request(app.callback())

__tests__/response/flushHeaders.test.js

@@ -84,16 +84,19 @@ describe('ctx.flushHeaders()', () => {
   it('should flush headers first and delay to send data', async () => {
     const PassThrough = require('stream').PassThrough
     const app = new Koa()
+    let headersFlushed = false
+    let dataReceived = false
 
     app.use(ctx => {
       ctx.type = 'json'
       ctx.status = 200
       ctx.headers.Link = '</css/mycss.css>; as=style; rel=preload, <https://img.craftflair.com>; rel=preconnect; crossorigin'
       const stream = ctx.body = new PassThrough()
       ctx.flushHeaders()
+      headersFlushed = true
       setTimeout(() => {
         stream.end(JSON.stringify({ message: 'hello!' }))
-      })
+      }, 10)
     })
 
     const server = app.listen()
@@ -105,10 +108,22 @@ describe('ctx.flushHeaders()', () => {
       req.end()
 
       const [res] = await once(req, 'response')
-      const onData = () => { throw new Error('boom') }
-      res.on('data', onData)
-      res.removeListener('data', onData)
+      assert(headersFlushed, 'Headers should be flushed')
+
+      const dataPromise = new Promise(resolve => {
+        res.once('data', chunk => {
+          dataReceived = true
+          resolve(chunk)
+        })
+      })
+
+      const timeoutPromise = new Promise((_, reject) =>
+        setTimeout(() => reject(new Error('Timeout waiting for data')), 10)
+      )
+
+      await Promise.race([dataPromise, timeoutPromise])
       res.destroy()
+      assert(dataReceived, 'Data should be received after headers')
     } finally {
       server.close()
     }

__tests__/response/writable.test.js

@@ -46,36 +46,43 @@ describe('res.writable', () => {
   describe('when socket closed before response sent', () => {
     it('should not be writable', async () => {
       const app = new Koa()
-      app.use(ctx => {
-        let assertionRan = false
-        assert(!ctx.writable)
+      let ctx
+      let assertionRan = false
+      app.on('error', () => {})
+
+      app.use(c => {
+        ctx = c
         assertionRan = true
-        assert(assertionRan)
       })
 
       const server = app.listen()
       const port = server.address().port
       const buf = Buffer.from('GET / HTTP/1.1\r\nHost: localhost:' + port + '\r\nConnection: keep-alive\r\n\r\n')
-
       const client = net.connect(port)
       await once(client, 'connect')
       client.write(buf)
+
+      await new Promise(resolve => setTimeout(resolve, 5))
       client.destroy()
 
       server.close()
       await once(server, 'close')
+
+      assert(ctx)
+      assert(assertionRan)
+      assert(!ctx.writable)
     })
   })
 
   describe('when response finished', () => {
     it('should not be writable', async () => {
       const app = new Koa()
+      let assertionRan = false
+
       app.use(ctx => {
         ctx.res.end()
-        let assertionRan = false
         assert(!ctx.writable)
         assertionRan = true
-        assert(assertionRan)
       })
 
       const server = app.listen()
@@ -85,10 +92,15 @@ describe('res.writable', () => {
       const client = net.connect(port)
       await once(client, 'connect')
       client.write(buf)
+
+      await new Promise(resolve => setTimeout(resolve, 5))
+
       client.destroy()
 
       server.close()
       await once(server, 'close')
+
+      assert(assertionRan)
     })
   })
 })