Replace unmaintained mock-express-response with node-mocks-http

package.json

@@ -297,9 +297,8 @@
     "jest-json-schema": "^6.1.0",
     "jest-watch-typeahead": "^2.2.2",
     "mini-css-extract-plugin": "^2.9.4",
-    "mock-express-request": "^0.2.0",
-    "mock-express-response": "^0.3.0",
     "node-fetch": "^3.3.2",
+    "node-mocks-http": "^1.17.2",
     "nodemon": "^3.1.10",
     "pino-devtools": "^2.8.0",
     "pino-pretty": "^13.1.1",

tests/unit/amo/middleware/test_HstsMiddleware.js

@@ -1,14 +1,13 @@
-import MockExpressRequest from 'mock-express-request';
-import MockExpressResponse from 'mock-express-response';
+import httpMocks from 'node-mocks-http';
 
 import { hsts } from 'amo/middleware';
 
 describe(__filename, () => {
   it('provides the expected HSTS headers', () => {
     const middleware = hsts();
     const nextSpy = sinon.stub();
-    const req = new MockExpressRequest();
-    const res = new MockExpressResponse();
+    const req = httpMocks.createRequest();
+    const res = httpMocks.createResponse();
 
     middleware(req, res, nextSpy);
 

tests/unit/amo/middleware/test_cspMiddleware.js

@@ -1,5 +1,4 @@
-import MockExpressRequest from 'mock-express-request';
-import MockExpressResponse from 'mock-express-response';
+import httpMocks from 'node-mocks-http';
 import parse from 'content-security-policy-parser';
 
 import { csp } from 'amo/middleware';
@@ -122,8 +121,8 @@ describe(__filename, () => {
       const config = require('config');
       const middleware = csp({ _config: config });
       const nextSpy = sinon.stub();
-      const req = new MockExpressRequest();
-      const res = new MockExpressResponse();
+      const req = httpMocks.createRequest();
+      const res = httpMocks.createResponse();
       middleware(req, res, nextSpy);
       const cspHeader = res.get('content-security-policy');
       const policy = parse(cspHeader);
@@ -140,8 +139,8 @@ describe(__filename, () => {
       const middleware = csp({ _config: getFakeConfig({ CSP: false }), _log });
 
       const nextSpy = sinon.stub();
-      const req = new MockExpressRequest();
-      const res = new MockExpressResponse();
+      const req = httpMocks.createRequest();
+      const res = httpMocks.createResponse();
 
       middleware(req, res, nextSpy);
 
@@ -157,8 +156,8 @@ describe(__filename, () => {
       const middleware = csp({ _config: getFakeConfig({ CSP: false }), _log });
 
       const nextSpy = sinon.stub();
-      const req = new MockExpressRequest();
-      const res = new MockExpressResponse();
+      const req = httpMocks.createRequest();
+      const res = httpMocks.createResponse();
 
       middleware(req, res, nextSpy);
 

tests/unit/amo/middleware/test_frameguardMiddleware.js

@@ -1,5 +1,4 @@
-import MockExpressRequest from 'mock-express-request';
-import MockExpressResponse from 'mock-express-response';
+import httpMocks from 'node-mocks-http';
 
 import { frameguard } from 'amo/middleware';
 
@@ -17,8 +16,8 @@ describe(__filename, () => {
     const conf = require('config');
     const middleware = frameguard({ _config: conf });
     const nextSpy = sinon.stub();
-    const req = new MockExpressRequest();
-    const res = new MockExpressResponse();
+    const req = httpMocks.createRequest();
+    const res = httpMocks.createResponse();
     middleware(req, res, nextSpy);
     expect(res.get('x-frame-options')).toEqual('DENY');
     sinon.assert.calledOnce(nextSpy);

tests/unit/amo/middleware/test_requestId.js

@@ -1,16 +1,15 @@
 /**
  * @jest-environment node
  */
-import MockExpressRequest from 'mock-express-request';
-import MockExpressResponse from 'mock-express-response';
+import httpMocks from 'node-mocks-http';
 
 import { AMO_REQUEST_ID_HEADER } from 'amo/constants';
 import requestId from 'amo/middleware/requestId';
 
 describe(__filename, () => {
   function _requestId({
-    req = new MockExpressRequest(),
-    res = new MockExpressResponse(),
+    req = httpMocks.createRequest(),
+    res = httpMocks.createResponse(),
     next = sinon.stub(),
     _httpContext = {
       set: sinon.stub(),
@@ -20,7 +19,7 @@ describe(__filename, () => {
   }
 
   it('adds a generated request ID to the HTTP context and response', () => {
-    const res = new MockExpressResponse();
+    const res = httpMocks.createResponse();
     const next = sinon.stub();
     const _httpContext = {
       set: sinon.stub(),
@@ -38,8 +37,8 @@ describe(__filename, () => {
   });
 
   it('uses the request ID from the request when available', () => {
-    const req = new MockExpressRequest();
-    const res = new MockExpressResponse();
+    const req = httpMocks.createRequest();
+    const res = httpMocks.createResponse();
     const _httpContext = {
       set: sinon.stub(),
     };
@@ -54,7 +53,7 @@ describe(__filename, () => {
   });
 
   it('ensures the request has AMO_REQUEST_ID_HEADER', () => {
-    const req = new MockExpressRequest();
+    const req = httpMocks.createRequest();
     expect(req.get(AMO_REQUEST_ID_HEADER)).not.toBeDefined();
 
     _requestId({ req });

tests/unit/amo/utils/test_server.js

@@ -1,7 +1,8 @@
 import path from 'path';
+import EventEmitter from 'events';
 
 import fs from 'fs-extra';
-import MockExpressResponse from 'mock-express-response';
+import httpMocks from 'node-mocks-http';
 
 import {
   viewFrontendVersionHandler,
@@ -19,16 +20,16 @@ describe(__filename, () => {
       const _config = getFakeConfig({ basePath });
       const handler = viewFrontendVersionHandler({ _config });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse({
+        eventEmitter: EventEmitter,
+      });
       handler(null, res);
 
-      res.on('finish', () => {
+      res.on('end', () => {
         expect(res.statusCode).toEqual(200);
-        expect(res.get('content-type')).toEqual(
-          'application/json; charset=utf-8',
-        );
+        expect(res.get('content-type')).toEqual('application/json');
         expect(res.get('access-control-allow-origin')).toEqual('*');
-        expect(res._getJSON()).toMatchObject(versionJson);
+        expect(res._getJSONData()).toMatchObject(versionJson);
 
         done();
       });
@@ -50,11 +51,13 @@ describe(__filename, () => {
       );
       const handler = viewFrontendVersionHandler({ _config });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse({
+        eventEmitter: EventEmitter,
+      });
       handler(null, res);
 
-      res.on('finish', () => {
-        expect(res._getJSON()).toMatchObject({
+      res.on('end', () => {
+        expect(res._getJSONData()).toMatchObject({
           ...versionJson,
           experiments,
           feature_flags: {
@@ -73,10 +76,12 @@ describe(__filename, () => {
 
       const handler = viewFrontendVersionHandler({ _config, _log });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse({
+        eventEmitter: EventEmitter,
+      });
       handler(null, res);
 
-      res.on('finish', () => {
+      res.on('end', () => {
         expect(res.statusCode).toEqual(415);
         sinon.assert.calledOnce(_log.error);
 
@@ -94,7 +99,7 @@ describe(__filename, () => {
       const _fetch = jest.fn().mockResolvedValue({ status: 200 });
       const handler = viewHeartbeatHandler({ _config, _fetch });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse();
       await handler(null, res);
 
       expect(_fetch).toHaveBeenCalledWith(
@@ -107,7 +112,7 @@ describe(__filename, () => {
       const _fetch = jest.fn().mockResolvedValue({ status: 400 });
       const handler = viewHeartbeatHandler({ _fetch });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse();
       await handler(null, res);
 
       expect(res.statusCode).toEqual(500);
@@ -117,7 +122,7 @@ describe(__filename, () => {
       const _fetch = jest.fn().mockRejectedValue();
       const handler = viewHeartbeatHandler({ _fetch });
 
-      const res = new MockExpressResponse();
+      const res = httpMocks.createResponse();
       await handler(null, res);
 
       expect(res.statusCode).toEqual(500);