diff --git a/packages/matrix-identity-server/src/index.test.ts b/packages/matrix-identity-server/src/index.test.ts index 268b40ab..61bb8713 100644 --- a/packages/matrix-identity-server/src/index.test.ts +++ b/packages/matrix-identity-server/src/index.test.ts @@ -1502,6 +1502,9 @@ describe('Use environment variables', () => { process.env.HASHES_RATE_LIMIT = '4' idServer = new IdServer() app = express() + app.use(express.json()) + app.use(express.urlencoded({ extended: true })) + idServer.ready // eslint-disable-next-line @typescript-eslint/promise-function-async .then(() => { @@ -1629,6 +1632,9 @@ describe('_matrix/identity/v2/terms', () => { } idServer2 = new IdServer(conf2) app2 = express() + app2.use(express.json()) + app2.use(express.urlencoded({ extended: true })) + idServer2.ready .then(() => { Object.keys(idServer2.api.get).forEach((k) => { diff --git a/packages/matrix-identity-server/src/terms.test.ts b/packages/matrix-identity-server/src/terms.test.ts index 68d4d3a5..4e62b15a 100644 --- a/packages/matrix-identity-server/src/terms.test.ts +++ b/packages/matrix-identity-server/src/terms.test.ts @@ -33,6 +33,8 @@ beforeAll((done) => { .then(() => { idServer = new IdServer() app = express() + app.use(express.json()) + app.use(express.urlencoded({ extended: true })) idServer.ready .then(() => { diff --git a/packages/utils/src/index.test.ts b/packages/utils/src/index.test.ts index 13a4820b..e388b07d 100644 --- a/packages/utils/src/index.test.ts +++ b/packages/utils/src/index.test.ts @@ -52,14 +52,7 @@ describe('Utility Functions', () => { it('should parse JSON content and call the callback', (done) => { const req = { headers: { 'content-type': 'application/json' }, - on: (event: string, callback: any) => { - if (event === 'data') { - callback(JSON.stringify({ key: 'value' })) - } - if (event === 'end') { - callback() - } - } + body: { key: 'value' } } as unknown as Request jsonContent( @@ -76,14 +69,7 @@ describe('Utility Functions', () => { it('should handle form-urlencoded content', (done) => { const req = { headers: { 'content-type': 'application/x-www-form-urlencoded' }, - on: (event: string, callback: any) => { - if (event === 'data') { - callback(querystring.stringify({ key: 'value' })) - } - if (event === 'end') { - callback() - } - } + body: { key: 'value' } } as unknown as Request jsonContent( @@ -97,7 +83,7 @@ describe('Utility Functions', () => { ) }) - it('should handle JSON parsing errors', (done) => { + it('should handle JSON parsing errors', () => { const req = { headers: { 'content-type': 'application/json' }, on: (event: string, callback: any) => { @@ -110,20 +96,15 @@ describe('Utility Functions', () => { } } as unknown as Request - jsonContent(req, mockResponse as Response, mockLogger, () => { - // No-op - }) + jsonContent(req, mockResponse as Response, mockLogger, () => {}) - setImmediate(() => { - expect(mockLogger.error).toHaveBeenCalled() - expect(mockResponse.writeHead).toHaveBeenCalledWith( - 400, - expect.any(Object) - ) - expect(mockResponse.write).toHaveBeenCalled() - expect(mockResponse.end).toHaveBeenCalled() - done() - }) + expect(mockLogger.error).toHaveBeenCalled() + expect(mockResponse.writeHead).toHaveBeenCalledWith( + 400, + expect.any(Object) + ) + expect(mockResponse.write).toHaveBeenCalled() + expect(mockResponse.end).toHaveBeenCalled() }) })