diff --git a/packages/dht/test/unit/AutoCertifierClientFacade.test.ts b/packages/dht/test/unit/AutoCertifierClientFacade.test.ts index 9e53d56e9d..280033d269 100644 --- a/packages/dht/test/unit/AutoCertifierClientFacade.test.ts +++ b/packages/dht/test/unit/AutoCertifierClientFacade.test.ts @@ -42,17 +42,17 @@ describe('AutoCertifierClientFacade', () => { it('start', async () => { await client.start() - expect(setHost).toBeCalled() - expect(updateCertificate).toBeCalled() + expect(setHost).toHaveBeenCalled() + expect(updateCertificate).toHaveBeenCalled() }) it('updated events are processed', async () => { await client.start() - expect(setHost).toBeCalledTimes(1) - expect(updateCertificate).toBeCalledTimes(1); + expect(setHost).toHaveBeenCalledTimes(1) + expect(updateCertificate).toHaveBeenCalledTimes(1); (mockClient as MockAutoCertifierClient).emitUpdateSubdomain() - expect(setHost).toBeCalledTimes(2) - expect(updateCertificate).toBeCalledTimes(2) + expect(setHost).toHaveBeenCalledTimes(2) + expect(updateCertificate).toHaveBeenCalledTimes(2) }) }) diff --git a/packages/dht/test/unit/SortedContactList.test.ts b/packages/dht/test/unit/SortedContactList.test.ts index e3a22c7a6e..4a30e7e653 100755 --- a/packages/dht/test/unit/SortedContactList.test.ts +++ b/packages/dht/test/unit/SortedContactList.test.ts @@ -38,7 +38,7 @@ describe('SortedContactList', () => { expect(list.getSize()).toEqual(3) expect(list.getClosestContacts()).toEqual([item1, item2, item3]) expect(list.getContactIds()).toEqual([item1.getNodeId(), item2.getNodeId(), item3.getNodeId()]) - expect(onContactRemoved).toBeCalledWith(item4) + expect(onContactRemoved).toHaveBeenCalledWith(item4) expect(list.getContact(item4.getNodeId())).toBeFalsy() }) @@ -106,9 +106,9 @@ describe('SortedContactList', () => { list.on('contactAdded', onContactAdded) list.addContact(item1) list.addContact(item2) - expect(onContactAdded).toBeCalledTimes(2) + expect(onContactAdded).toHaveBeenCalledTimes(2) list.addContact(item3) - expect(onContactAdded).toBeCalledTimes(2) + expect(onContactAdded).toHaveBeenCalledTimes(2) expect(list.getClosestContacts().length).toEqual(2) }) diff --git a/packages/node/test/integration/plugins/storage/BatchManager.test.ts b/packages/node/test/integration/plugins/storage/BatchManager.test.ts index 26e485dc1b..e3db16fa59 100644 --- a/packages/node/test/integration/plugins/storage/BatchManager.test.ts +++ b/packages/node/test/integration/plugins/storage/BatchManager.test.ts @@ -136,7 +136,7 @@ describe('BatchManager', () => { await until(() => batch.retries === 1) - expect(mockBatch).toBeCalledTimes(1) + expect(mockBatch).toHaveBeenCalledTimes(1) expect(batch.retries).toEqual(1) jest.restoreAllMocks() diff --git a/packages/node/test/integration/plugins/websocket/close.test.ts b/packages/node/test/integration/plugins/websocket/close.test.ts index f7360cab07..5b6dcc51cd 100644 --- a/packages/node/test/integration/plugins/websocket/close.test.ts +++ b/packages/node/test/integration/plugins/websocket/close.test.ts @@ -16,7 +16,7 @@ describe('close', () => { client.on('close', onClose) server.stop() await wait(100) - expect(onClose).toBeCalled() + expect(onClose).toHaveBeenCalled() }) it('paused client doesn\'t prevent server stop', async () => { diff --git a/packages/node/test/integration/plugins/websocket/ping.test.ts b/packages/node/test/integration/plugins/websocket/ping.test.ts index 8dd9a148a5..f92365cf2c 100644 --- a/packages/node/test/integration/plugins/websocket/ping.test.ts +++ b/packages/node/test/integration/plugins/websocket/ping.test.ts @@ -46,7 +46,7 @@ describe('ping', () => { client.ping(PAYLOAD) const pongMessage = await payloads.pop() expect(pongMessage).toBe(PAYLOAD) - expect(streamrClient.publish).not.toBeCalled() + expect(streamrClient.publish).not.toHaveBeenCalled() }) it('application layer', async () => { @@ -58,7 +58,7 @@ describe('ping', () => { client.send('ping') const pongMessage = await messages.pop() expect(pongMessage).toBe('pong') - expect(streamrClient.publish).not.toBeCalled() + expect(streamrClient.publish).not.toHaveBeenCalled() }) }) @@ -135,7 +135,7 @@ describe('ping', () => { client.resume() // wait some time so that buffered events (e.g. 'close' are processed) await wait(10) - expect(onClose).toBeCalled() + expect(onClose).toHaveBeenCalled() }) it('disable ping', async () => { @@ -145,7 +145,7 @@ describe('ping', () => { const onPing = jest.fn() client.on('ping', onPing) await wait(100) - expect(onPing).not.toBeCalled() + expect(onPing).not.toHaveBeenCalled() }) it('disable disconnect', async () => { @@ -156,7 +156,7 @@ describe('ping', () => { client.on('close', onClose) client.pause() await wait(100) - expect(onClose).not.toBeCalled() + expect(onClose).not.toHaveBeenCalled() }) }) }) diff --git a/packages/node/test/unit/plugins/http/publishEndpoint.test.ts b/packages/node/test/unit/plugins/http/publishEndpoint.test.ts index b85a314b77..c731b9fd24 100644 --- a/packages/node/test/unit/plugins/http/publishEndpoint.test.ts +++ b/packages/node/test/unit/plugins/http/publishEndpoint.test.ts @@ -41,8 +41,8 @@ describe('publishEndpoint', () => { await postMessage({ foo: 'bar' }, queryParams).expect(200) - expect(streamrClient.publish).toBeCalledTimes(1) - expect(streamrClient.publish).toBeCalledWith({ + expect(streamrClient.publish).toHaveBeenCalledTimes(1) + expect(streamrClient.publish).toHaveBeenCalledWith({ streamId: MOCK_STREAM_ID, streamPartition: expectedPartition }, { @@ -99,7 +99,7 @@ describe('publishEndpoint', () => { await postMessage({ foo: 2 }, {}) - expect(streamrClient.publish).toBeCalledTimes(2) + expect(streamrClient.publish).toHaveBeenCalledTimes(2) const firstMessageMsgChainId = streamrClient.publish.mock.calls[0][2].msgChainId const secondMessageMsgChainId = streamrClient.publish.mock.calls[1][2].msgChainId expect(firstMessageMsgChainId).toBeDefined() diff --git a/packages/node/test/unit/plugins/mqtt/Bridge.test.ts b/packages/node/test/unit/plugins/mqtt/Bridge.test.ts index aac94a09b0..665ebd7384 100644 --- a/packages/node/test/unit/plugins/mqtt/Bridge.test.ts +++ b/packages/node/test/unit/plugins/mqtt/Bridge.test.ts @@ -48,7 +48,7 @@ describe('MQTT Bridge', () => { it('onMessageReceived', async () => { await bridge.onMessageReceived(topic, JSON.stringify(MOCK_CONTENT), MOCK_CLIENT_ID) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_STREAM_ID, partition: undefined }, MOCK_CONTENT, { msgChainId: expect.any(String) } @@ -57,13 +57,13 @@ describe('MQTT Bridge', () => { it('onSubscribed', async () => { await bridge.onSubscribed(topic, MOCK_CLIENT_ID) - expect(streamrClient.subscribe).toBeCalledWith(`${MOCK_STREAM_ID}#0`, expect.anything()) + expect(streamrClient.subscribe).toHaveBeenCalledWith(`${MOCK_STREAM_ID}#0`, expect.anything()) }) it('onUnsubscribed', async () => { await bridge.onSubscribed(topic, MOCK_CLIENT_ID) bridge.onUnsubscribed(topic, MOCK_CLIENT_ID) - expect(subscription.unsubscribe).toBeCalled() + expect(subscription.unsubscribe).toHaveBeenCalled() }) }) @@ -104,7 +104,7 @@ describe('MQTT Bridge', () => { it('publish with partition', async () => { await bridge.onMessageReceived(`${MOCK_TOPIC}?partition=5`, JSON.stringify(MOCK_CONTENT), MOCK_CLIENT_ID) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_TOPIC, partition: 5 @@ -119,7 +119,7 @@ describe('MQTT Bridge', () => { it('publish with partition key', async () => { await bridge.onMessageReceived(`${MOCK_TOPIC}?partitionKey=mock-key`, JSON.stringify(MOCK_CONTENT), MOCK_CLIENT_ID) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_TOPIC, partition: undefined @@ -135,7 +135,7 @@ describe('MQTT Bridge', () => { it('publish with partition key field', async () => { await bridge.onMessageReceived(`${MOCK_TOPIC}?partitionKeyField=foo`, JSON.stringify(MOCK_CONTENT), MOCK_CLIENT_ID) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_TOPIC, partition: undefined @@ -151,7 +151,7 @@ describe('MQTT Bridge', () => { it('subscribe', async () => { await bridge.onSubscribed(`${MOCK_TOPIC}?partition=5`, MOCK_CLIENT_ID) - expect(streamrClient.subscribe).toBeCalledWith( + expect(streamrClient.subscribe).toHaveBeenCalledWith( `${MOCK_TOPIC}#5`, expect.anything() ) diff --git a/packages/node/test/unit/plugins/storage/StorageConfig.test.ts b/packages/node/test/unit/plugins/storage/StorageConfig.test.ts index e67da2ff9a..8486f23ca8 100644 --- a/packages/node/test/unit/plugins/storage/StorageConfig.test.ts +++ b/packages/node/test/unit/plugins/storage/StorageConfig.test.ts @@ -80,8 +80,8 @@ describe(StorageConfig, () => { }) it('stream part listeners invoked', () => { - expect(onStreamPartAdded).toBeCalledTimes(6) - expect(onStreamPartRemoved).toBeCalledTimes(0) + expect(onStreamPartAdded).toHaveBeenCalledTimes(6) + expect(onStreamPartRemoved).toHaveBeenCalledTimes(0) expect(onStreamPartAdded.mock.calls).toEqual([ [parse('stream-1#0')], [parse('stream-1#1')], @@ -123,8 +123,8 @@ describe(StorageConfig, () => { }) it('stream part listeners invoked', () => { - expect(onStreamPartAdded).toBeCalledTimes(2 + 1) - expect(onStreamPartRemoved).toBeCalledTimes(2) + expect(onStreamPartAdded).toHaveBeenCalledTimes(2 + 1) + expect(onStreamPartRemoved).toHaveBeenCalledTimes(2) expect(onStreamPartAdded.mock.calls).toEqual([ [parse('stream-1#0')], [parse('stream-1#1')], diff --git a/packages/node/test/unit/plugins/storage/StoragePoller.test.ts b/packages/node/test/unit/plugins/storage/StoragePoller.test.ts index 8a25291359..15d8178e7e 100644 --- a/packages/node/test/unit/plugins/storage/StoragePoller.test.ts +++ b/packages/node/test/unit/plugins/storage/StoragePoller.test.ts @@ -63,13 +63,13 @@ describe(StoragePoller, () => { poller = initPoller(0) await poller.start(abortController.signal) await wait(POLL_TIME * 10) - expect(getStoredStreams).toBeCalledTimes(1) + expect(getStoredStreams).toHaveBeenCalledTimes(1) }) it('start() handles polling errors gracefully', async () => { getStoredStreams.mockRejectedValue(new Error('poll failed')) await poller.start(abortController.signal) await wait(POLL_TIME * 2) - expect(onNewSnapshot).toBeCalledTimes(0) // Should not have encountered unhandledRejectionError + expect(onNewSnapshot).toHaveBeenCalledTimes(0) // Should not have encountered unhandledRejectionError }) }) diff --git a/packages/node/test/unit/plugins/websocket/WebsocketServer.test.ts b/packages/node/test/unit/plugins/websocket/WebsocketServer.test.ts index e9dd847367..4ea42764d1 100644 --- a/packages/node/test/unit/plugins/websocket/WebsocketServer.test.ts +++ b/packages/node/test/unit/plugins/websocket/WebsocketServer.test.ts @@ -74,7 +74,7 @@ describe('WebsocketServer', () => { it('without parameters', async () => { await connectAndPublish() - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_STREAM_ID, partition: undefined @@ -88,7 +88,7 @@ describe('WebsocketServer', () => { it('valid partition', async () => { await connectAndPublish({ partition: 50 }) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_STREAM_ID, partition: 50 @@ -102,7 +102,7 @@ describe('WebsocketServer', () => { it('valid partitionKey', async () => { await connectAndPublish({ partitionKey: 'mock-key' }) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_STREAM_ID, partition: undefined @@ -117,7 +117,7 @@ describe('WebsocketServer', () => { it('valid partitionKeyField', async () => { await connectAndPublish({ partitionKeyField: 'foo' }) - expect(streamrClient.publish).toBeCalledWith( + expect(streamrClient.publish).toHaveBeenCalledWith( { id: MOCK_STREAM_ID, partition: undefined @@ -149,14 +149,14 @@ describe('WebsocketServer', () => { it('without parameters', async () => { wsClient = createTestClient(PATH_SUBSCRIBE_MOCK_STREAM) await waitForEvent(wsClient, 'open') - expect(streamrClient.subscribe).toBeCalledTimes(1) - expect(streamrClient.subscribe).toBeCalledWith({ id: MOCK_STREAM_ID, partition: undefined }, expect.anything()) + expect(streamrClient.subscribe).toHaveBeenCalledTimes(1) + expect(streamrClient.subscribe).toHaveBeenCalledWith({ id: MOCK_STREAM_ID, partition: undefined }, expect.anything()) }) it('valid partitions', async () => { wsClient = createTestClient(PATH_SUBSCRIBE_MOCK_STREAM, { partitions: '0,2,5' }) await waitForEvent(wsClient, 'open') - expect(streamrClient.subscribe).toBeCalledTimes(3) + expect(streamrClient.subscribe).toHaveBeenCalledTimes(3) expect(streamrClient.subscribe).toHaveBeenNthCalledWith(1, { id: MOCK_STREAM_ID, partition: 0 }, expect.anything()) expect(streamrClient.subscribe).toHaveBeenNthCalledWith(2, { id: MOCK_STREAM_ID, partition: 2 }, expect.anything()) expect(streamrClient.subscribe).toHaveBeenNthCalledWith(3, { id: MOCK_STREAM_ID, partition: 5 }, expect.anything()) diff --git a/packages/sdk/test/integration/client-destroy.test.ts b/packages/sdk/test/integration/client-destroy.test.ts index deb68bda33..4338eba9d6 100644 --- a/packages/sdk/test/integration/client-destroy.test.ts +++ b/packages/sdk/test/integration/client-destroy.test.ts @@ -26,7 +26,7 @@ describe('client destroy', () => { const sub = await client.subscribe(stream.id) jest.spyOn(sub, 'unsubscribe') await client.destroy() - expect(sub.unsubscribe).toBeCalled() + expect(sub.unsubscribe).toHaveBeenCalled() }) it('ongoing subscribe pipeline ends', async () => { @@ -35,7 +35,7 @@ describe('client destroy', () => { sub.on('error', onError) const outputPromise = collect(sub) await client.destroy() - expect(onError).toBeCalledTimes(0) + expect(onError).toHaveBeenCalledTimes(0) expect(await outputPromise).toEqual([]) }) diff --git a/packages/sdk/test/integration/events.test.ts b/packages/sdk/test/integration/events.test.ts index 0ad27d2050..022a0c4086 100644 --- a/packages/sdk/test/integration/events.test.ts +++ b/packages/sdk/test/integration/events.test.ts @@ -36,7 +36,7 @@ describe('events', () => { const onResendComplete = jest.fn() subscription.once('resendCompleted', onResendComplete) await client.destroy() - expect(onResendComplete).not.toBeCalled() + expect(onResendComplete).not.toHaveBeenCalled() // @ts-expect-error private expect(subscription.eventEmitter.listenerCount()).toBe(0) }) diff --git a/packages/sdk/test/integration/resend-with-existing-key.test.ts b/packages/sdk/test/integration/resend-with-existing-key.test.ts index 51ab35e5be..5edc561467 100644 --- a/packages/sdk/test/integration/resend-with-existing-key.test.ts +++ b/packages/sdk/test/integration/resend-with-existing-key.test.ts @@ -56,7 +56,7 @@ describe('resend with existing key', () => { const onError = jest.fn() messageStream.onError.listen(onError) const messages = await collect(messageStream) - expect(onError).not.toBeCalled() + expect(onError).not.toHaveBeenCalled() const expectedTimestamps = allMessages.map((m) => m.timestamp).filter((ts) => ts >= fromTimestamp && ts <= toTimestamp) expect(messages.map((m) => m.timestamp)).toEqual(expectedTimestamps) } @@ -66,7 +66,7 @@ describe('resend with existing key', () => { const onError = jest.fn() messageStream.onError.listen(onError) await collect(messageStream) - expect(onError).toBeCalled() + expect(onError).toHaveBeenCalled() const error = onError.mock.calls[0][0] expect(error).toBeInstanceOf(DecryptError) } diff --git a/packages/sdk/test/integration/unsubscribe.test.ts b/packages/sdk/test/integration/unsubscribe.test.ts index 61e337fdcd..e453022d6a 100644 --- a/packages/sdk/test/integration/unsubscribe.test.ts +++ b/packages/sdk/test/integration/unsubscribe.test.ts @@ -55,7 +55,7 @@ describe('unsubscribe', () => { await client.unsubscribe(sub) expect(await client.getSubscriptions()).toHaveLength(0) - expect(sub.unsubscribe).toBeCalled() + expect(sub.unsubscribe).toHaveBeenCalled() }) it('twice', async () => { diff --git a/packages/sdk/test/unit/CachingMap.test.ts b/packages/sdk/test/unit/CachingMap.test.ts index c38dbedd9e..271952cb45 100644 --- a/packages/sdk/test/unit/CachingMap.test.ts +++ b/packages/sdk/test/unit/CachingMap.test.ts @@ -24,7 +24,7 @@ describe('CachingMap', () => { const result2 = await cache.get('foo', 'bar') expect(result1).toBe('FOOBAR') expect(result2).toBe('FOOBAR') - expect(plainFn).toBeCalledTimes(1) + expect(plainFn).toHaveBeenCalledTimes(1) }) it('miss', async () => { @@ -32,7 +32,7 @@ describe('CachingMap', () => { const result2 = await cache.get('foo', 'y') expect(result1).toBe('FOOX') expect(result2).toBe('FOOY') - expect(plainFn).toBeCalledTimes(2) + expect(plainFn).toHaveBeenCalledTimes(2) }) it('concurrency', async () => { @@ -42,7 +42,7 @@ describe('CachingMap', () => { ]) expect(result1).toBe('FOOBAR') expect(result2).toBe('FOOBAR') - expect(plainFn).toBeCalledTimes(1) + expect(plainFn).toHaveBeenCalledTimes(1) }) it('rejections are not cached', async () => { @@ -52,7 +52,7 @@ describe('CachingMap', () => { await expect(cache.get('foo', 'x')).rejects.toEqual(new Error('error foo-x')) await expect(cache.get('foo', 'x')).rejects.toEqual(new Error('error foo-x')) - expect(plainFn).toBeCalledTimes(2) // would be 1 if rejections were cached + expect(plainFn).toHaveBeenCalledTimes(2) // would be 1 if rejections were cached }) it('throws are not cached', async () => { @@ -62,6 +62,6 @@ describe('CachingMap', () => { await expect(cache.get('foo', 'x')).rejects.toEqual(new Error('error foo-x')) await expect(cache.get('foo', 'x')).rejects.toEqual(new Error('error foo-x')) - expect(plainFn).toBeCalledTimes(2) // would be 1 if throws were cached + expect(plainFn).toHaveBeenCalledTimes(2) // would be 1 if throws were cached }) }) diff --git a/packages/sdk/test/unit/Decrypt.test.ts b/packages/sdk/test/unit/Decrypt.test.ts index b516041d4e..7fa321c608 100644 --- a/packages/sdk/test/unit/Decrypt.test.ts +++ b/packages/sdk/test/unit/Decrypt.test.ts @@ -32,7 +32,7 @@ describe('Decrypt', () => { encryptionType: EncryptionType.NONE, content: unencryptedContent })) - expect(groupKeyManager.fetchKey).toBeCalledWith( + expect(groupKeyManager.fetchKey).toHaveBeenCalledWith( encryptedMessage.getStreamPartID(), encryptedMessage.groupKeyId, encryptedMessage.getPublisherId() diff --git a/packages/sdk/test/unit/GapFiller.test.ts b/packages/sdk/test/unit/GapFiller.test.ts index 96c60e987f..3fb3c1f5e3 100644 --- a/packages/sdk/test/unit/GapFiller.test.ts +++ b/packages/sdk/test/unit/GapFiller.test.ts @@ -114,8 +114,8 @@ describe('GapFiller', () => { ) addMessages([1, 4]) await expectOrderedMessages([1, 2, 3, 4]) - expect(getStorageNodeAddresses).toBeCalledTimes(1) - expect(resend).toBeCalledTimes(1) + expect(getStorageNodeAddresses).toHaveBeenCalledTimes(1) + expect(resend).toHaveBeenCalledTimes(1) expect(resend).toHaveBeenCalledWith( { from: createMessage(1), @@ -143,8 +143,8 @@ describe('GapFiller', () => { ) addMessages([1, 3, 5]) await expectOrderedMessages([1, 2, 3, 4, 5]) - expect(getStorageNodeAddresses).toBeCalledTimes(2) - expect(resend).toBeCalledTimes(2) + expect(getStorageNodeAddresses).toHaveBeenCalledTimes(2) + expect(resend).toHaveBeenCalledTimes(2) }) it('partial fill', async () => { @@ -157,7 +157,7 @@ describe('GapFiller', () => { ) addMessages([1, 5]) await expectOrderedMessages([1, 3, 5]) - expect(resend).toBeCalledTimes(MAX_REQUESTS_PER_GAP) + expect(resend).toHaveBeenCalledTimes(MAX_REQUESTS_PER_GAP) }) it('realtime data resolves gap', async () => { @@ -169,8 +169,8 @@ describe('GapFiller', () => { ) addMessages([1, 3, 2]) await expectOrderedMessages([1, 2, 3]) - expect(getStorageNodeAddresses).not.toBeCalled() - expect(resend).not.toBeCalled() + expect(getStorageNodeAddresses).not.toHaveBeenCalled() + expect(resend).not.toHaveBeenCalled() }) it('no storage nodes', async () => { @@ -183,8 +183,8 @@ describe('GapFiller', () => { ) addMessages([1, 3, 5]) await expectOrderedMessages([1, 3, 5]) - expect(getStorageNodeAddresses).toBeCalledTimes(2) - expect(resend).not.toBeCalled() + expect(getStorageNodeAddresses).toHaveBeenCalledTimes(2) + expect(resend).not.toHaveBeenCalled() }) it('destroy while waiting', async () => { @@ -197,8 +197,8 @@ describe('GapFiller', () => { addMessages([1, 3]) abortController.abort() await expectOrderedMessages([1]) - expect(getStorageNodeAddresses).not.toBeCalled() - expect(resend).not.toBeCalled() + expect(getStorageNodeAddresses).not.toHaveBeenCalled() + expect(resend).not.toHaveBeenCalled() }) it('destroy while ongoing gap fill', async () => { diff --git a/packages/sdk/test/unit/GroupKeyQueue.test.ts b/packages/sdk/test/unit/GroupKeyQueue.test.ts index d4d904327d..038cb01618 100644 --- a/packages/sdk/test/unit/GroupKeyQueue.test.ts +++ b/packages/sdk/test/unit/GroupKeyQueue.test.ts @@ -28,8 +28,8 @@ describe('GroupKeyQueue', () => { it('can rotate and use', async () => { const groupKey = GroupKey.generate() await queue.rotate(groupKey) - expect(groupKeyStore.set).toBeCalledTimes(1) - expect(groupKeyStore.set).toBeCalledWith(groupKey.id, await authentication.getUserId(), groupKey.data) + expect(groupKeyStore.set).toHaveBeenCalledTimes(1) + expect(groupKeyStore.set).toHaveBeenCalledWith(groupKey.id, await authentication.getUserId(), groupKey.data) expect(await queue.useGroupKey()).toEqual({ current: groupKey }) expect(await queue.useGroupKey()).toEqual({ current: groupKey }) const groupKey2 = GroupKey.generate() diff --git a/packages/sdk/test/unit/Mapping.test.ts b/packages/sdk/test/unit/Mapping.test.ts index 73488036d2..a278f24693 100644 --- a/packages/sdk/test/unit/Mapping.test.ts +++ b/packages/sdk/test/unit/Mapping.test.ts @@ -27,7 +27,7 @@ describe('Mapping', () => { const mapping = new Mapping(valueFactory) expect(await mapping.get('foo')).toBe(undefined) expect(await mapping.get('foo')).toBe(undefined) - expect(valueFactory).toBeCalledTimes(1) + expect(valueFactory).toHaveBeenCalledTimes(1) }) }) diff --git a/packages/sdk/test/unit/MetricsPublisher.test.ts b/packages/sdk/test/unit/MetricsPublisher.test.ts index 7b2e7c9571..eb0ad1babb 100644 --- a/packages/sdk/test/unit/MetricsPublisher.test.ts +++ b/packages/sdk/test/unit/MetricsPublisher.test.ts @@ -54,7 +54,7 @@ describe('MetricsPublisher', () => { const assertPublisherDisabled = async (config: Pick) => { startMetricsPublisher(config) await wait(10) - expect(metricsContext.createReportProducer).not.toBeCalled() + expect(metricsContext.createReportProducer).not.toHaveBeenCalled() } beforeEach(() => { diff --git a/packages/sdk/test/unit/OrderMessages.test.ts b/packages/sdk/test/unit/OrderMessages.test.ts index c30ddaa3ae..cb40451e70 100644 --- a/packages/sdk/test/unit/OrderMessages.test.ts +++ b/packages/sdk/test/unit/OrderMessages.test.ts @@ -118,7 +118,7 @@ describe('OrderMessages', () => { const orderMessages = createOrderMessages(resends) await orderMessages.addMessages(fromArray(without(msgs, ...missing))) expect(await collect(orderMessages)).toEqual(msgs) - expect(resends.resend).toBeCalledWith( + expect(resends.resend).toHaveBeenCalledWith( STREAM_PART_ID, { from: new MessageRef(2000, 1), @@ -141,7 +141,7 @@ describe('OrderMessages', () => { const orderMessages = createOrderMessages(resends) await orderMessages.addMessages(fromArray(without(msgs, ...missing))) expect(await collect(orderMessages)).toEqual(msgs) - expect(resends.resend).toBeCalledWith( + expect(resends.resend).toHaveBeenCalledWith( STREAM_PART_ID, { from: new MessageRef(2000, 1), @@ -202,7 +202,7 @@ describe('OrderMessages', () => { const orderMessages = createOrderMessages(resends) await orderMessages.addMessages(fromArray(without(msgs, ...missing))) expect(await collect(orderMessages)).toEqual(without(msgs, ...missing)) - expect(resends.resend).toBeCalledTimes(CONFIG.maxGapRequests) + expect(resends.resend).toHaveBeenCalledTimes(CONFIG.maxGapRequests) }) it('ignore missing message if gap filling disable', async () => { @@ -216,7 +216,7 @@ describe('OrderMessages', () => { } as any) await orderMessages.addMessages(fromArray(without(msgs, ...missing))) expect(await collect(orderMessages)).toEqual(without(msgs, ...missing)) - expect(resends.resend).toBeCalledTimes(0) + expect(resends.resend).toHaveBeenCalledTimes(0) }) it('aborts resends when destroyed', async () => { @@ -288,8 +288,8 @@ describe('OrderMessages', () => { startConsuming(orderMessages) await addMessages(orderMessages) expect(outputMessages).toEqual(availableMessages) - expect(resends.resend).toBeCalledTimes(3 + CONFIG.maxGapRequests) - expect(onUnfillableGap).toBeCalledTimes(1) + expect(resends.resend).toHaveBeenCalledTimes(3 + CONFIG.maxGapRequests) + expect(onUnfillableGap).toHaveBeenCalledTimes(1) expect(onUnfillableGap.mock.calls[0][0].from.messageId.timestamp).toBe(4000) expect(onUnfillableGap.mock.calls[0][0].to.messageId.timestamp).toBe(7000) }) @@ -307,8 +307,8 @@ describe('OrderMessages', () => { startConsuming(orderMessages) await addMessages(orderMessages) expect(outputMessages).toEqual(availableMessages) - expect(resends.resend).toBeCalledTimes(3 + CONFIG.maxGapRequests) - expect(onUnfillableGap).toBeCalledTimes(1) + expect(resends.resend).toHaveBeenCalledTimes(3 + CONFIG.maxGapRequests) + expect(onUnfillableGap).toHaveBeenCalledTimes(1) expect(onUnfillableGap.mock.calls[0][0].from.messageId.timestamp).toBe(3000) expect(onUnfillableGap.mock.calls[0][0].to.messageId.timestamp).toBe(8000) }) @@ -334,8 +334,8 @@ describe('OrderMessages', () => { (m) => !UNAVAILABLE.includes(m.getTimestamp()) && (m.getTimestamp() !== 9000) ) expect(outputMessages).toEqual(expectedMessages) - expect(resends.resend).toBeCalledTimes(2 + CONFIG.maxGapRequests) - expect(onUnfillableGap).toBeCalledTimes(2) + expect(resends.resend).toHaveBeenCalledTimes(2 + CONFIG.maxGapRequests) + expect(onUnfillableGap).toHaveBeenCalledTimes(2) expect(onUnfillableGap.mock.calls[0][0].from.messageId.timestamp).toBe(4000) expect(onUnfillableGap.mock.calls[0][0].to.messageId.timestamp).toBe(7000) expect(onUnfillableGap.mock.calls[1][0].from.messageId.timestamp).toBe(8000) @@ -360,8 +360,8 @@ describe('OrderMessages', () => { (m) => !ERROR.includes(m.getTimestamp()) && (m.getTimestamp() !== 9000) ) expect(outputMessages).toEqual(expectedMessages) - expect(resends.resend).toBeCalledTimes(2 + CONFIG.maxGapRequests) - expect(onUnfillableGap).toBeCalledTimes(2) + expect(resends.resend).toHaveBeenCalledTimes(2 + CONFIG.maxGapRequests) + expect(onUnfillableGap).toHaveBeenCalledTimes(2) expect(onUnfillableGap.mock.calls[0][0].from.messageId.timestamp).toBe(3000) expect(onUnfillableGap.mock.calls[0][0].to.messageId.timestamp).toBe(8000) expect(onUnfillableGap.mock.calls[1][0].from.messageId.timestamp).toBe(8000) @@ -377,7 +377,7 @@ describe('OrderMessages', () => { const orderMessages = createOrderMessages(undefined as any, undefined, getStorageNodes) await orderMessages.addMessages(fromArray(await createMessages(5))) await collect(orderMessages) - expect(getStorageNodes).not.toBeCalled() + expect(getStorageNodes).not.toHaveBeenCalled() }) it('multiple gaps', async () => { @@ -391,7 +391,7 @@ describe('OrderMessages', () => { ) await orderMessages.addMessages(fromArray(messages)) await collect(orderMessages) - expect(getStorageNodes).toBeCalledTimes(1) + expect(getStorageNodes).toHaveBeenCalledTimes(1) }) }) }) diff --git a/packages/sdk/test/unit/OrderedMessageChain.test.ts b/packages/sdk/test/unit/OrderedMessageChain.test.ts index d6b30852b6..85edfc0093 100644 --- a/packages/sdk/test/unit/OrderedMessageChain.test.ts +++ b/packages/sdk/test/unit/OrderedMessageChain.test.ts @@ -41,17 +41,17 @@ describe('OrderedMessageChain', () => { } const expectFoundGaps = (gaps: Gap[], allResolved = true) => { - expect(onGapFound).toBeCalledTimes(gaps.length) + expect(onGapFound).toHaveBeenCalledTimes(gaps.length) for (let i = 0; i < gaps.length; i++) { expect(onGapFound).toHaveBeenNthCalledWith(i + 1, gaps[i]) } if (allResolved) { - expect(onGapResolved).toBeCalledTimes(gaps.length) + expect(onGapResolved).toHaveBeenCalledTimes(gaps.length) } } const expectUnfillableGaps = (gaps: Gap[]) => { - expect(onUnfillableGap).toBeCalledTimes(gaps.length) + expect(onUnfillableGap).toHaveBeenCalledTimes(gaps.length) for (let i = 0; i < gaps.length; i++) { expect(onUnfillableGap).toHaveBeenNthCalledWith(i + 1, gaps[i]) } @@ -84,7 +84,7 @@ describe('OrderedMessageChain', () => { expectFoundGaps([ createGap(1, 3) ], false) - expect(onGapResolved).not.toBeCalled() + expect(onGapResolved).not.toHaveBeenCalled() }) it('fill single gap', () => { @@ -215,7 +215,7 @@ describe('OrderedMessageChain', () => { expectUnfillableGaps([ createGap(2, 4) ]) - expect(onGapResolved).toBeCalledTimes(1) + expect(onGapResolved).toHaveBeenCalledTimes(1) }) it('find only the current gap when resolving all messages', () => { diff --git a/packages/sdk/test/unit/events.test.ts b/packages/sdk/test/unit/events.test.ts index 36701e247e..d4e92616d0 100644 --- a/packages/sdk/test/unit/events.test.ts +++ b/packages/sdk/test/unit/events.test.ts @@ -13,7 +13,7 @@ describe('events', () => { const stream = await client.createStream('/test') await client.publish(stream.id, {}) await stream.publish({}) - expect(onEmit).toBeCalledTimes(2) + expect(onEmit).toHaveBeenCalledTimes(2) }) }) }) diff --git a/packages/sdk/test/unit/messagePipeline.test.ts b/packages/sdk/test/unit/messagePipeline.test.ts index f3cd1bcbea..ce2dce85b8 100644 --- a/packages/sdk/test/unit/messagePipeline.test.ts +++ b/packages/sdk/test/unit/messagePipeline.test.ts @@ -133,7 +133,7 @@ describe('messagePipeline', () => { const onError = jest.fn() pipeline.onError.listen(onError) const output = await collect(pipeline) - expect(onError).toBeCalledTimes(1) + expect(onError).toHaveBeenCalledTimes(1) const error = onError.mock.calls[0][0] expect(error.message).toContain('Signature validation failed') expect(output).toEqual([]) @@ -148,7 +148,7 @@ describe('messagePipeline', () => { const onError = jest.fn() pipeline.onError.listen(onError) const output = await collect(pipeline) - expect(onError).toBeCalledTimes(1) + expect(onError).toHaveBeenCalledTimes(1) const error = onError.mock.calls[0][0] expect(error.message).toContain('Invalid JSON') expect(output).toEqual([]) @@ -166,13 +166,13 @@ describe('messagePipeline', () => { const onError = jest.fn() pipeline.onError.listen(onError) const output = await collect(pipeline) - expect(onError).toBeCalledTimes(1) + expect(onError).toHaveBeenCalledTimes(1) const error = onError.mock.calls[0][0] expect(error).toBeInstanceOf(DecryptError) expect(error.message).toMatch(/timed out/) expect(output).toEqual([]) - expect(streamRegistry.invalidatePermissionCaches).toBeCalledTimes(1) - expect(streamRegistry.invalidatePermissionCaches).toBeCalledWith(StreamPartIDUtils.getStreamID(streamPartId)) + expect(streamRegistry.invalidatePermissionCaches).toHaveBeenCalledTimes(1) + expect(streamRegistry.invalidatePermissionCaches).toHaveBeenCalledWith(StreamPartIDUtils.getStreamID(streamPartId)) }) it('error: exception', async () => { @@ -184,7 +184,7 @@ describe('messagePipeline', () => { pipeline.onError.listen(onError) const output = await collect(pipeline) expect(output).toHaveLength(1) - expect(onError).toBeCalledTimes(1) - expect(onError).toBeCalledWith(err) + expect(onError).toHaveBeenCalledTimes(1) + expect(onError).toHaveBeenCalledWith(err) }) }) diff --git a/packages/sdk/test/unit/resendSubscription.test.ts b/packages/sdk/test/unit/resendSubscription.test.ts index ea5669eff6..93af6dc89e 100644 --- a/packages/sdk/test/unit/resendSubscription.test.ts +++ b/packages/sdk/test/unit/resendSubscription.test.ts @@ -146,9 +146,9 @@ describe('resend subscription', () => { ...immediateRealtimeMessages ] expectEqualMessageCollections(outputMessages, expectedMessages) - expect(onResendComplete).toBeCalledTimes(1) + expect(onResendComplete).toHaveBeenCalledTimes(1) expect(latestMessageWhenResendComplete!.content).toEqual(last(historicalMessages)!.getParsedContent()) - expect(resend).toBeCalledTimes(2) // the historical messages fetch and the gap fill + expect(resend).toHaveBeenCalledTimes(2) // the historical messages fetch and the gap fill }) it('gap not fillable', async () => { @@ -166,7 +166,7 @@ describe('resend subscription', () => { ...realtimeMessages ] expectEqualMessageCollections(outputMessages, expectedMessages) - expect(resend).toBeCalledTimes(MAX_GAP_REQUESTS + 1) // the historical messages fetch and all gap fill tries + expect(resend).toHaveBeenCalledTimes(MAX_GAP_REQUESTS + 1) // the historical messages fetch and all gap fill tries }) it('no historical data', async () => { @@ -178,7 +178,7 @@ describe('resend subscription', () => { await sub.unsubscribe() expectEqualMessageCollections(outputMessages, realtimeMessages) - expect(resend).toBeCalledTimes(1) // the historical messages fetch + expect(resend).toHaveBeenCalledTimes(1) // the historical messages fetch }) it('gap fill disabled', async () => { @@ -196,7 +196,7 @@ describe('resend subscription', () => { ...realtimeMessages ] expectEqualMessageCollections(outputMessages, expectedMessages) - expect(resend).toBeCalledTimes(1) // the historical messages fetch + expect(resend).toHaveBeenCalledTimes(1) // the historical messages fetch }) it('multiple message chains', async () => { @@ -236,7 +236,7 @@ describe('resend subscription', () => { ] expectEqualMessageCollections(outputMessages.values().filter((m) => m.msgChainId === msgChainIds[0]), expectedMessages1) expectEqualMessageCollections(outputMessages.values().filter((m) => m.msgChainId === msgChainIds[1]), expectedMessages2) - expect(resend).toBeCalledTimes(3) // the historical messages fetch and one gap fill for each message chain + expect(resend).toHaveBeenCalledTimes(3) // the historical messages fetch and one gap fill for each message chain }) it('ignore duplicate', async () => { @@ -257,7 +257,7 @@ describe('resend subscription', () => { ...realtimeMessages, ] expectEqualMessageCollections(outputMessages, expectedMessages) - expect(resend).toBeCalledTimes(2) // the historical messages fetch and the gap fill + expect(resend).toHaveBeenCalledTimes(2) // the historical messages fetch and the gap fill }) it('real-time resolves gap', async () => { @@ -276,7 +276,7 @@ describe('resend subscription', () => { ...realtimeMessages, ] expectEqualMessageCollections(outputMessages, expectedMessages) - expect(resend).toBeCalledTimes(1) // the historical messages fetch + expect(resend).toHaveBeenCalledTimes(1) // the historical messages fetch }) }) diff --git a/packages/trackerless-network/test/unit/Inspector.test.ts b/packages/trackerless-network/test/unit/Inspector.test.ts index 00a3ea8e71..7f4002a210 100644 --- a/packages/trackerless-network/test/unit/Inspector.test.ts +++ b/packages/trackerless-network/test/unit/Inspector.test.ts @@ -45,7 +45,7 @@ describe('Inspector', () => { }, 250) await inspector.inspect(inspectedDescriptor) expect(inspector.isInspected(toNodeId(inspectedDescriptor))).toBe(false) - expect(mockConnect).toBeCalledTimes(1) + expect(mockConnect).toHaveBeenCalledTimes(1) }) }) diff --git a/packages/trackerless-network/test/unit/NetworkNode.test.ts b/packages/trackerless-network/test/unit/NetworkNode.test.ts index aba0e865d2..d3d8db0c14 100644 --- a/packages/trackerless-network/test/unit/NetworkNode.test.ts +++ b/packages/trackerless-network/test/unit/NetworkNode.test.ts @@ -33,10 +33,10 @@ describe('NetworkNode', () => { contentDeliveryManager.emit('newMessage', msg2) expect(onMessage.mock.calls[0][0]).toEqual(msg1) expect(onMessage.mock.calls[1][0]).toEqual(msg2) - expect(onMessage).toBeCalledTimes(2) + expect(onMessage).toHaveBeenCalledTimes(2) node.removeMessageListener(onMessage) contentDeliveryManager.emit('newMessage', createMessage(3)) - expect(onMessage).toBeCalledTimes(2) + expect(onMessage).toHaveBeenCalledTimes(2) }) }) diff --git a/packages/utils/test/addManagedEventListener.test.ts b/packages/utils/test/addManagedEventListener.test.ts index b2c3c3f77b..b77a60d0dc 100644 --- a/packages/utils/test/addManagedEventListener.test.ts +++ b/packages/utils/test/addManagedEventListener.test.ts @@ -20,12 +20,12 @@ describe('addManagedEventListener', () => { ) emitter.emit('foo', 'abc', 111) emitter.emit('foo', 'abc', 222) - expect(listener).toBeCalledTimes(2) + expect(listener).toHaveBeenCalledTimes(2) expect(listener).toHaveBeenNthCalledWith(1, 'abc', 111) expect(listener).toHaveBeenNthCalledWith(2, 'abc', 222) abortController.abort() emitter.emit('foo', 'abc', 333) - expect(listener).toBeCalledTimes(2) + expect(listener).toHaveBeenCalledTimes(2) }) it('already aborted', () => { @@ -40,6 +40,6 @@ describe('addManagedEventListener', () => { abortController.signal ) emitter.emit('foo', 'abc', 111) - expect(listener).not.toBeCalled() + expect(listener).not.toHaveBeenCalled() }) }) diff --git a/packages/utils/test/initEventGateway.test.ts b/packages/utils/test/initEventGateway.test.ts index 5f084c5699..2202530cc3 100644 --- a/packages/utils/test/initEventGateway.test.ts +++ b/packages/utils/test/initEventGateway.test.ts @@ -35,70 +35,70 @@ describe('gateway', () => { it('happy path', () => { initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) const listener = () => {} - expect(start).toBeCalledTimes(0) - expect(stop).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(0) + expect(stop).toHaveBeenCalledTimes(0) emitter.on(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(1) - expect(stop).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(0) emitter.off(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(1) - expect(stop).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(1) }) it('multiple listeners', () => { initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) const listener1 = () => {} const listener2 = () => {} - expect(start).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(0) emitter.on(MOCK_EVENT_NAME, listener1) - expect(start).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(1) emitter.on(MOCK_EVENT_NAME, listener2) - expect(start).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(1) emitter.off(MOCK_EVENT_NAME, listener1) - expect(stop).toBeCalledTimes(0) + expect(stop).toHaveBeenCalledTimes(0) emitter.off(MOCK_EVENT_NAME, listener2) - expect(stop).toBeCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(1) }) it('once', () => { initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) const listener = () => {} - expect(start).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(0) emitter.once(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(1) - expect(stop).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(0) emitter.emit(MOCK_EVENT_NAME, MOCK_EVENT_PAYLOAD) - expect(stop).toBeCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(1) }) it('ignorable event', () => { initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) emitter.on(OTHER_EVENT_NAME, () => {}) - expect(start).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(0) }) it('start if initial listeners', () => { emitter.on(MOCK_EVENT_NAME, () => {}) initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) - expect(start).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(1) }) it('restart', () => { initEventGateway(MOCK_EVENT_NAME, start, stop, emitter) const listener = () => {} - expect(start).toBeCalledTimes(0) - expect(stop).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(0) + expect(stop).toHaveBeenCalledTimes(0) emitter.on(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(1) - expect(stop).toBeCalledTimes(0) + expect(start).toHaveBeenCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(0) emitter.off(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(1) - expect(stop).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(1) + expect(stop).toHaveBeenCalledTimes(1) emitter.on(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(2) - expect(stop).toBeCalledTimes(1) + expect(start).toHaveBeenCalledTimes(2) + expect(stop).toHaveBeenCalledTimes(1) emitter.off(MOCK_EVENT_NAME, listener) - expect(start).toBeCalledTimes(2) - expect(stop).toBeCalledTimes(2) + expect(start).toHaveBeenCalledTimes(2) + expect(stop).toHaveBeenCalledTimes(2) }) }) diff --git a/packages/utils/test/until.test.ts b/packages/utils/test/until.test.ts index 1f0df2d576..a1522f10b5 100644 --- a/packages/utils/test/until.test.ts +++ b/packages/utils/test/until.test.ts @@ -40,7 +40,7 @@ describe('until', () => { it('resolves immediately if conditionFn returns (promisified) true from the get-go', async () => { const fn = jest.fn().mockResolvedValue(true) await until(fn) - expect(fn).toBeCalledTimes(1) + expect(fn).toHaveBeenCalledTimes(1) }) it('resolves eventually when conditionFn returns (promisified) true', async () => { @@ -48,7 +48,7 @@ describe('until', () => { .mockResolvedValueOnce(false) .mockResolvedValueOnce(true) await until(fn) - expect(fn).toBeCalledTimes(2) + expect(fn).toHaveBeenCalledTimes(2) }) it('rejects if conditionFn keeps returning (promisified) false within timeout', async () => {