From eca22f5623aae6424805fa0133a8ca7750037cef Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Mon, 29 Aug 2022 02:43:29 +0200 Subject: [PATCH] refactor(test): fix linting errors Signed-off-by: Philip Molares --- .../realtime-note/realtime-note-store.spec.ts | 2 +- .../realtime-note.service.spec.ts | 32 +++++++++++-------- .../realtime-note/realtime-note.spec.ts | 4 +-- .../realtime-note/websocket-awareness.spec.ts | 8 ++--- .../websocket-connection.spec.ts | 10 +++--- .../realtime-note/websocket-doc.spec.ts | 8 ++--- .../websocket/websocket.gateway.spec.ts | 28 ++++++++-------- src/revisions/revisions.service.spec.ts | 2 +- src/session/session.service.spec.ts | 6 ++-- 9 files changed, 54 insertions(+), 46 deletions(-) diff --git a/src/realtime/realtime-note/realtime-note-store.spec.ts b/src/realtime/realtime-note/realtime-note-store.spec.ts index e7caaed20..782817b91 100644 --- a/src/realtime/realtime-note/realtime-note-store.spec.ts +++ b/src/realtime/realtime-note/realtime-note-store.spec.ts @@ -42,7 +42,7 @@ describe('RealtimeNoteStore', () => { expect(realtimeNoteStore.create(mockedNote, mockedContent)).toBe( mockedRealtimeNote, ); - expect(realtimeNoteConstructorSpy).toBeCalledWith( + expect(realtimeNoteConstructorSpy).toHaveBeenCalledWith( mockedNote, mockedContent, ); diff --git a/src/realtime/realtime-note/realtime-note.service.spec.ts b/src/realtime/realtime-note/realtime-note.service.spec.ts index 6aab09dbf..d041e5bdd 100644 --- a/src/realtime/realtime-note/realtime-note.service.spec.ts +++ b/src/realtime/realtime-note/realtime-note.service.spec.ts @@ -109,9 +109,12 @@ describe('RealtimeNoteService', () => { realtimeNoteService.getOrCreateRealtimeNote(mockedNote), ).resolves.toBe(mockedRealtimeNote); - expect(realtimeNoteStore.find).toBeCalledWith(mockedNoteId); - expect(realtimeNoteStore.create).toBeCalledWith(mockedNote, mockedContent); - expect(setIntervalSpy).not.toBeCalled(); + expect(realtimeNoteStore.find).toHaveBeenCalledWith(mockedNoteId); + expect(realtimeNoteStore.create).toHaveBeenCalledWith( + mockedNote, + mockedContent, + ); + expect(setIntervalSpy).not.toHaveBeenCalled(); }); describe('with periodic timer', () => { @@ -125,11 +128,11 @@ describe('RealtimeNoteService', () => { await realtimeNoteService.getOrCreateRealtimeNote(mockedNote); - expect(setIntervalSpy).toBeCalledWith( + expect(setIntervalSpy).toHaveBeenCalledWith( expect.any(Function), 1000 * 60 * 10, ); - expect(addIntervalSpy).toBeCalled(); + expect(addIntervalSpy).toHaveBeenCalled(); }); it('stops the timer if the realtime note gets destroyed', async () => { @@ -142,8 +145,8 @@ describe('RealtimeNoteService', () => { await realtimeNoteService.getOrCreateRealtimeNote(mockedNote); mockedRealtimeNote.emit('destroy'); - expect(deleteIntervalSpy).toBeCalled(); - expect(clearIntervalSpy).toBeCalled(); + expect(deleteIntervalSpy).toHaveBeenCalled(); + expect(clearIntervalSpy).toHaveBeenCalled(); }); }); @@ -155,8 +158,8 @@ describe('RealtimeNoteService', () => { await expect( realtimeNoteService.getOrCreateRealtimeNote(mockedNote), ).rejects.toBe(`Revision for note mockedNoteId not found.`); - expect(realtimeNoteStore.create).not.toBeCalled(); - expect(realtimeNoteStore.find).toBeCalledWith(mockedNoteId); + expect(realtimeNoteStore.create).not.toHaveBeenCalled(); + expect(realtimeNoteStore.find).toHaveBeenCalledWith(mockedNoteId); }); it("doesn't create a new realtime note if there is already one", async () => { @@ -178,7 +181,7 @@ describe('RealtimeNoteService', () => { await expect( realtimeNoteService.getOrCreateRealtimeNote(mockedNote), ).resolves.toBe(mockedRealtimeNote); - expect(realtimeNoteStore.create).toBeCalledTimes(1); + expect(realtimeNoteStore.create).toHaveBeenCalledTimes(1); }); it('saves a realtime note if it gets destroyed', async () => { @@ -200,7 +203,10 @@ describe('RealtimeNoteService', () => { .mockImplementation(() => Promise.resolve(Mock.of())); mockedRealtimeNote.emit('beforeDestroy'); - expect(createRevisionSpy).toBeCalledWith(mockedNote, mockedCurrentContent); + expect(createRevisionSpy).toHaveBeenCalledWith( + mockedNote, + mockedCurrentContent, + ); }); it('logs errors that occur during saving on destroy', async () => { @@ -224,7 +230,7 @@ describe('RealtimeNoteService', () => { mockedRealtimeNote.emit('beforeDestroy'); await waitForOtherPromisesToFinish(); - expect(logSpy).toBeCalled(); + expect(logSpy).toHaveBeenCalled(); }); it('destroys every realtime note on application shutdown', () => { @@ -236,6 +242,6 @@ describe('RealtimeNoteService', () => { realtimeNoteService.beforeApplicationShutdown(); - expect(destroySpy).toBeCalled(); + expect(destroySpy).toHaveBeenCalled(); }); }); diff --git a/src/realtime/realtime-note/realtime-note.spec.ts b/src/realtime/realtime-note/realtime-note.spec.ts index 4c31d36f5..4906b12c7 100644 --- a/src/realtime/realtime-note/realtime-note.spec.ts +++ b/src/realtime/realtime-note/realtime-note.spec.ts @@ -67,8 +67,8 @@ describe('realtime note', () => { const docDestroy = jest.spyOn(mockedDoc, 'destroy'); const awarenessDestroy = jest.spyOn(mockedAwareness, 'destroy'); sut.destroy(); - expect(docDestroy).toBeCalled(); - expect(awarenessDestroy).toBeCalled(); + expect(docDestroy).toHaveBeenCalled(); + expect(awarenessDestroy).toHaveBeenCalled(); }); it('emits destroy event on destruction', async () => { diff --git a/src/realtime/realtime-note/websocket-awareness.spec.ts b/src/realtime/realtime-note/websocket-awareness.spec.ts index 86b5803c5..c22405037 100644 --- a/src/realtime/realtime-note/websocket-awareness.spec.ts +++ b/src/realtime/realtime-note/websocket-awareness.spec.ts @@ -48,10 +48,10 @@ describe('websocket-awareness', () => { removed: [3], }; websocketAwareness.emit('update', [mockUpdate, mockConnection1]); - expect(send1).not.toBeCalled(); - expect(send2).not.toBeCalled(); - expect(send3).toBeCalledWith(mockEncodedUpdate); - expect(mockedEncodeUpdateFunction).toBeCalledWith( + expect(send1).not.toHaveBeenCalled(); + expect(send2).not.toHaveBeenCalled(); + expect(send3).toHaveBeenCalledWith(mockEncodedUpdate); + expect(mockedEncodeUpdateFunction).toHaveBeenCalledWith( websocketAwareness, [1, 2, 3], ); diff --git a/src/realtime/realtime-note/websocket-connection.spec.ts b/src/realtime/realtime-note/websocket-connection.spec.ts index 19d1bcea4..98c43880e 100644 --- a/src/realtime/realtime-note/websocket-connection.spec.ts +++ b/src/realtime/realtime-note/websocket-connection.spec.ts @@ -79,7 +79,7 @@ describe('websocket connection', () => { new WebsocketConnection(mockedWebsocket, mockedUser, mockedRealtimeNote); - expect(setupWebsocketSpy).toBeCalledWith(mockedWebsocket); + expect(setupWebsocketSpy).toHaveBeenCalledWith(mockedWebsocket); }); it('forwards sent messages to the transporter', () => { @@ -92,7 +92,7 @@ describe('websocket connection', () => { const sendFunctionSpy = jest.spyOn(mockedWebsocketTransporter, 'send'); const sendContent = new Uint8Array(); sut.send(sendContent); - expect(sendFunctionSpy).toBeCalledWith(sendContent); + expect(sendFunctionSpy).toHaveBeenCalledWith(sendContent); }); it('forwards disconnect calls to the transporter', () => { @@ -107,7 +107,7 @@ describe('websocket connection', () => { 'disconnect', ); sut.disconnect(); - expect(disconnectFunctionSpy).toBeCalled(); + expect(disconnectFunctionSpy).toHaveBeenCalled(); }); it('forwards isSynced checks to the transporter', () => { @@ -139,7 +139,7 @@ describe('websocket connection', () => { mockedWebsocketTransporter.emit('disconnected'); - expect(removeClientSpy).toBeCalledWith(sut); + expect(removeClientSpy).toHaveBeenCalledWith(sut); }); it('remembers the controlled awareness-ids on awareness update', () => { @@ -180,7 +180,7 @@ describe('websocket connection', () => { mockedWebsocketTransporter.emit('disconnected'); - expect(removeAwarenessSpy).toBeCalledWith(mockedAwareness, [0], sut); + expect(removeAwarenessSpy).toHaveBeenCalledWith(mockedAwareness, [0], sut); }); it('saves the correct user', () => { diff --git a/src/realtime/realtime-note/websocket-doc.spec.ts b/src/realtime/realtime-note/websocket-doc.spec.ts index a1ed7d428..fedc65fab 100644 --- a/src/realtime/realtime-note/websocket-doc.spec.ts +++ b/src/realtime/realtime-note/websocket-doc.spec.ts @@ -47,10 +47,10 @@ describe('websocket-doc', () => { const websocketDoc = new WebsocketDoc(realtimeNote, ''); const mockUpdate = new Uint8Array([4, 5, 6, 7]); websocketDoc.emit('update', [mockUpdate, mockConnection1]); - expect(send1).not.toBeCalled(); - expect(send2).not.toBeCalled(); - expect(send3).toBeCalledWith(mockEncodedUpdate); - expect(mockedEncodeUpdateFunction).toBeCalledWith(mockUpdate); + expect(send1).not.toHaveBeenCalled(); + expect(send2).not.toHaveBeenCalled(); + expect(send3).toHaveBeenCalledWith(mockEncodedUpdate); + expect(mockedEncodeUpdateFunction).toHaveBeenCalledWith(mockUpdate); websocketDoc.destroy(); }); }); diff --git a/src/realtime/websocket/websocket.gateway.spec.ts b/src/realtime/websocket/websocket.gateway.spec.ts index ac891426a..180b12ad0 100644 --- a/src/realtime/websocket/websocket.gateway.spec.ts +++ b/src/realtime/websocket/websocket.gateway.spec.ts @@ -242,8 +242,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).toBeCalledWith(mockedWebsocketConnection); - expect(mockedWebsocketCloseSpy).not.toBeCalled(); + expect(addClientSpy).toHaveBeenCalledWith(mockedWebsocketConnection); + expect(mockedWebsocketCloseSpy).not.toHaveBeenCalled(); }); it('closes the connection if invalid session cookie', async () => { @@ -260,8 +260,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); it("closes the connection if session doesn't exist", async () => { @@ -280,8 +280,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); it("closes the connection if user doesn't exist for username", async () => { @@ -300,8 +300,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); it("closes the connection if url doesn't contain a valid note id", async () => { @@ -318,8 +318,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); it('closes the connection if url contains an invalid note id', async () => { @@ -338,8 +338,8 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); it('closes the connection if user has no read permissions', async () => { @@ -358,7 +358,7 @@ describe('Websocket gateway', () => { await expect( gateway.handleConnection(mockedWebsocket, request), ).resolves.not.toThrow(); - expect(addClientSpy).not.toBeCalled(); - expect(mockedWebsocketCloseSpy).toBeCalled(); + expect(addClientSpy).not.toHaveBeenCalled(); + expect(mockedWebsocketCloseSpy).toHaveBeenCalled(); }); }); diff --git a/src/revisions/revisions.service.spec.ts b/src/revisions/revisions.service.spec.ts index 6fc742cf3..0a1f24b45 100644 --- a/src/revisions/revisions.service.spec.ts +++ b/src/revisions/revisions.service.spec.ts @@ -234,7 +234,7 @@ describe('RevisionsService', () => { const createdRevision = await service.createRevision(note, oldContent); expect(createdRevision).toBeUndefined(); - expect(saveSpy).not.toBeCalled(); + expect(saveSpy).not.toHaveBeenCalled(); }); }); }); diff --git a/src/session/session.service.spec.ts b/src/session/session.service.spec.ts index 322674c3b..8e8be2f05 100644 --- a/src/session/session.service.spec.ts +++ b/src/session/session.service.spec.ts @@ -70,11 +70,13 @@ describe('SessionService', () => { }); it('creates a new TypeormStore on create', () => { - expect(typeormStoreConstructorMock).toBeCalledWith({ + expect(typeormStoreConstructorMock).toHaveBeenCalledWith({ cleanupLimit: 2, limitSubquery: true, }); - expect(mockedTypeormStore.connect).toBeCalledWith(mockedSessionRepository); + expect(mockedTypeormStore.connect).toHaveBeenCalledWith( + mockedSessionRepository, + ); expect(sessionService.getTypeormStore()).toBe(mockedTypeormStore); });