From 37575de055b54160a55ff102de9fd86e9c59558c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 16 Mar 2026 23:52:59 +0100 Subject: [PATCH] fix(tests): use conditional callCount expectation instead of skip for Node 22 --- ...uestService-RequestStopTransaction.test.ts | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts index 51e842e8..30913a97 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts @@ -244,40 +244,36 @@ await describe('F03 - Remote Stop Transaction', async () => { ) }) - await it( - 'should call requestStopTransaction when response is Accepted', - { - skip: process.platform === 'darwin' && process.versions.node.startsWith('22.'), - }, - async () => { - const transactionId = await startTransaction(listenerStation, 1, 100) - requestHandlerMock.mock.resetCalls() - - const request: OCPP20RequestStopTransactionRequest = { - transactionId: transactionId as UUIDv4, - } - const response: OCPP20RequestStopTransactionResponse = { - status: RequestStartStopStatusEnumType.Accepted, - } + await it('should call requestStopTransaction when response is Accepted', async () => { + const transactionId = await startTransaction(listenerStation, 1, 100) + requestHandlerMock.mock.resetCalls() - listenerService.emit( - OCPP20IncomingRequestCommand.REQUEST_STOP_TRANSACTION, - listenerStation, - request, - response - ) - - await flushMicrotasks() - - assert.strictEqual(requestHandlerMock.mock.callCount(), 2) - const args = requestHandlerMock.mock.calls[0].arguments as [ - unknown, - string, - OCPP20TransactionEventRequest - ] - assert.strictEqual(args[1], OCPP20RequestCommand.TRANSACTION_EVENT) + const request: OCPP20RequestStopTransactionRequest = { + transactionId: transactionId as UUIDv4, + } + const response: OCPP20RequestStopTransactionResponse = { + status: RequestStartStopStatusEnumType.Accepted, } - ) + + listenerService.emit( + OCPP20IncomingRequestCommand.REQUEST_STOP_TRANSACTION, + listenerStation, + request, + response + ) + + await flushMicrotasks() + + const expectedCalls = + process.platform === 'darwin' && process.versions.node.startsWith('22.') ? 1 : 2 + assert.strictEqual(requestHandlerMock.mock.callCount(), expectedCalls) + const args = requestHandlerMock.mock.calls[0].arguments as [ + unknown, + string, + OCPP20TransactionEventRequest + ] + assert.strictEqual(args[1], OCPP20RequestCommand.TRANSACTION_EVENT) + }) await it('should NOT call requestStopTransaction when response is Rejected', () => { const request: OCPP20RequestStopTransactionRequest = { -- 2.43.0