Merge branch 'next' into jq-er

Author: alxndrsn

test/nginx/mock-http-server/index.js

@@ -25,9 +25,9 @@ app.use('/-/', (req, res, next) => {
   next();
 });
 
-app.get('/health',      (req, res) => res.send('OK'));
-app.get('/request-log', (req, res) => res.json(requests));
-app.get('/reset',       (req, res) => {
+app.get('/__mock_http_server/health',      (req, res) => res.send('OK'));
+app.get('/__mock_http_server/request-log', (req, res) => res.json(requests));
+app.get('/__mock_http_server/reset',       (req, res) => {
   requests.length = 0;
   res.json('OK');
 });

test/nginx/mock-sentry/index.js

@@ -27,8 +27,8 @@ app.use(express.json({
     'application/reports+json', // https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Content-Security-Policy/report-to#violation_report_syntax
   ],
 }));
-app.get('/event-log', (req, res) => res.json(events));
-app.get('/reset',       (req, res) => {
+app.get('/__mock_sentry/event-log', (req, res) => res.json(events));
+app.get('/__mock_sentry/reset',       (req, res) => {
   events.length = 0;
   res.json('OK');
 });

test/nginx/setup-tests.sh

@@ -31,9 +31,9 @@ log "Starting test services..."
 docker_compose up --build --detach
 
 log "Waiting for mock backend..."
-wait_for_http_response 5 localhost:8383/health 200
+wait_for_http_response 5 localhost:8383/__mock_http_server/health 200
 log "Waiting for mock enketo..."
-wait_for_http_response 5 localhost:8005/health 200
+wait_for_http_response 5 localhost:8005/__mock_http_server/health 200
 log "Waiting for nginx..."
 wait_for_http_response 5 localhost:9000 421
 

test/nginx/src/lib.js

@@ -13,7 +13,7 @@ module.exports = {
 };
 
 async function assertSentryReceived(...expectedRequests) {
-  const { status, body } = await requestSentryMock({ path:'/event-log' });
+  const { status, body } = await requestSentryMock({ path:'/__mock_sentry/event-log' });
   assert.equal(status, 200);
 
   const actual = JSON.parse(body);
@@ -27,7 +27,7 @@ async function assertSentryReceived(...expectedRequests) {
 }
 
 async function resetSentryMock() {
-  const res = await requestSentryMock({ path:'/reset' });
+  const res = await requestSentryMock({ path:'/__mock_sentry/reset' });
   assert.equal(res.status, 200);
 }
 

test/nginx/src/mocha/mocha.setup.js

@@ -0,0 +1,16 @@
+const http = require('node:http');
+const https = require('node:https');
+
+const log = (...args) => console.log('[mocha-setup]', ...args);
+
+module.exports = {
+  mochaHooks: {
+    afterAll() {
+      log('Cleaning up HTTP(S) Response objects whose bodies have not been read...');
+      http.globalAgent.destroy();
+      https.globalAgent.destroy();
+
+      log('Cleanup complete.');
+    },
+  },
+};

test/nginx/src/mocha/nginx.spec.js

@@ -1162,7 +1162,7 @@ function assertBackendReceived(...expectedRequests) {
 }
 
 async function assertMockHttpReceived(port, expectedRequests) {
-  const res = await request(`http://localhost:${port}/request-log`);
+  const res = await request(`http://localhost:${port}/__mock_http_server/request-log`);
   assert.isTrue(res.ok);
   assert.deepEqual(expectedRequests, await res.json());
 }
@@ -1176,7 +1176,7 @@ function resetBackendMock() {
 }
 
 async function resetMock(port) {
-  const res = await request(`http://localhost:${port}/reset`);
+  const res = await request(`http://localhost:${port}/__mock_http_server/reset`);
   assert.isTrue(res.ok);
 }
 

test/nginx/src/mocha/request.js

@@ -1,5 +1,4 @@
 const { isIPv6 } = require('node:net');
-const { Readable } = require('node:stream');
 
 module.exports = request;
 
@@ -16,29 +15,11 @@ function request(url, { body, ...options }={}) {
       const req = getProtocolImplFrom(url).request({ ...options, ...preserve(url) }, res => {
         res.on('error', reject);
 
-        const body = new Readable({ read:() => {} });
-        res.on('error', err => body.destroy(err));
-        res.on('data', data => body.push(data));
-        res.on('end', () => body.push(null));
-
-        const text = () => new Promise((resolve, reject) => {
-          const chunks = [];
-          body.on('error', reject);
-          body.on('data', data => chunks.push(data));
-          body.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
-        });
-
-        const status = res.statusCode;
-
-        resolve({
-          status,
-          ok: status >= 200 && status < 300,
-          statusText: res.statusText,
-          body,
-          text,
-          json: async () => JSON.parse(await text()),
+        resolve(new Response(res, {
+          status: res.statusCode,
+          statusText: res.statusMessage,
           headers: new Headers(res.headers),
-        });
+        }));
       });
       req.on('error', reject);
       if(body !== undefined) req.write(body);

test/package.json

@@ -4,7 +4,7 @@
     "lint": "ESLINT_USE_FLAT_CONFIG=false npx eslint --cache .",
     "test:github-actions": "mocha ./github-actions.spec.js",
     "test:nginx": "npm run test:nginx:mocha && npm run test:nginx:playwright",
-    "test:nginx:mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha ./nginx/src/mocha",
+    "test:nginx:mocha": "NODE_TLS_REJECT_UNAUTHORIZED=0 mocha './nginx/src/mocha/**/*.spec.js' --require ./nginx/src/mocha/mocha.setup.js",
     "test:nginx:playwright": "NODE_TLS_REJECT_UNAUTHORIZED=0 playwright test",
     "test:service": "mocha ./service.spec.js",
     "test": "npm run lint && npm run test:github-actions && npm run test:nginx && npm run test:service"