Fix cleanup to be consistent across node releases

hapijs · Aug 25, 2020 · 5aa1573 · 5aa1573
1 parent 919acb6
commit 5aa1573
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/lib/request.js b/lib/request.js
@@ -13,7 +13,10 @@ exports = module.exports = internals.Request = class extends Stream.Readable {
 
     constructor(options) {
 
-        super();
+        super({
+            emitClose: !!(options.simulate && options.simulate.close),
+            autoDestroy: true        // This is the default in node 14+
+        });
 
         // options: method, url, payload, headers, remoteAddress
 
@@ -136,19 +139,11 @@ exports = module.exports = internals.Request = class extends Stream.Readable {
                 this.emit('error', new Error('Simulated'));
             }
 
-            if (this._shot.simulate.close) {
-                this.emit('close');
-            }
-
             if (this._shot.simulate.end !== false) {        // 'end' defaults to true
                 this.push(null);
             }
         });
     }
-
-    destroy() {
-
-    }
 };
 
 

diff --git a/lib/response.js b/lib/response.js
@@ -82,10 +82,6 @@ exports = module.exports = internals.Response = class extends Http.ServerRespons
         this.emit('finish');
     }
 
-    destroy() {
-
-    }
-
     addTrailers(trailers) {
 
         for (const key in trailers) {

diff --git a/test/index.js b/test/index.js
@@ -562,6 +562,32 @@ describe('_read()', () => {
         expect(res.payload).to.equal(body);
     });
 
+    it('supports async iteration', async () => {
+
+        const dispatch = async function (req, res) {
+
+            req.on('close', () => console.log('close'))
+            let buffer = '';
+            try {
+                for await (const chunk of req) {
+                    console.log('chunk')
+                    buffer = buffer + chunk.toString();
+                }
+            } catch (err) {
+                console.error(err)
+            }
+            console.log('done')
+
+            res.writeHead(200, { 'Content-Length': 0 });
+            res.end(buffer);
+            req.destroy();
+        };
+
+        const body = 'something special just for you';
+        const res = await Shot.inject(dispatch, { method: 'get', url: '/', payload: body });
+        expect(res.payload).to.equal(body);
+    });
+
     it('simulates split', async () => {
 
         const dispatch = function (req, res) {