fix: update depreciated jest methods (#407)

Author: annarhughes

src/partner-access/partner-access.service.spec.ts

@@ -120,7 +120,7 @@ describe('PartnerAccessService', () => {
         );
 
       await service.createPartnerAccess(createPartnerAccessDto, partnerId, partnerAdminId);
-      expect(repoSpyCreateQueryBuilder).toBeCalledTimes(2);
+      expect(repoSpyCreateQueryBuilder).toHaveBeenCalledTimes(2);
       repoSpyCreateQueryBuilder.mockRestore();
     });
   });
@@ -141,7 +141,7 @@ describe('PartnerAccessService', () => {
         activatedAt: partnerAccess.activatedAt, // need to just fudge this as it is test specific
       });
 
-      expect(crispApi.updateCrispProfileAccesses).toBeCalledWith(
+      expect(crispApi.updateCrispProfileAccesses).toHaveBeenCalledWith(
         mockGetUserDto.user,
         [partnerAccess],
         [],
@@ -246,14 +246,10 @@ describe('PartnerAccessService', () => {
           }),
         }) as never,
       );
-      await expect(service.getValidPartnerAccessCode('123456')).rejects.toThrowError(
-        'CODE_EXPIRED',
-      );
+      await expect(service.getValidPartnerAccessCode('123456')).rejects.toThrow('CODE_EXPIRED');
     });
     it('when an partner access with too many letters is supplied, it should throw error', async () => {
-      await expect(service.getValidPartnerAccessCode('1234567')).rejects.toThrowError(
-        'INVALID_CODE',
-      );
+      await expect(service.getValidPartnerAccessCode('1234567')).rejects.toThrow('INVALID_CODE');
     });
   });
 
@@ -295,7 +291,7 @@ describe('PartnerAccessService', () => {
       } as UpdatePartnerAccessDto);
       //if an access code exists then update it.
       expect(result).toEqual({ ...mockPartnerAccessEntity, therapySessionsRemaining: 10 });
-      expect(partnerAccessRepositorySpy).toBeCalledTimes(1);
+      expect(partnerAccessRepositorySpy).toHaveBeenCalled();
     });
   });
 });

src/partner-admin/partner-admin.service.spec.ts

@@ -81,7 +81,7 @@ describe('PartnerAdminService', () => {
       const response = await service.createPartnerAdminUser(dto);
       expect(response).toHaveProperty('partnerId', dto.partnerId);
       expect(response).toHaveProperty('userId', mockUserEntity.id);
-      expect(repoSpySave).toBeCalled();
+      expect(repoSpySave).toHaveBeenCalled();
     });
   });
   it('when supplied with an email that already exists, it should throw', async () => {

src/partner-feature/partner-feature.service.spec.ts

@@ -81,13 +81,13 @@ describe('PartnerFeatureService', () => {
       jest.spyOn(mockFeatureService, 'getFeature').mockImplementationOnce(() => {
         return undefined;
       });
-      await expect(service.createPartnerFeature(createPartnerFeatureDto)).rejects.toThrowError();
+      await expect(service.createPartnerFeature(createPartnerFeatureDto)).rejects.toThrow();
     });
     it('when supplied with incorrect partnerId should throw', async () => {
       jest.spyOn(mockPartnerService, 'getPartnerById').mockImplementationOnce(() => {
         return undefined;
       });
-      await expect(service.createPartnerFeature(createPartnerFeatureDto)).rejects.toThrowError();
+      await expect(service.createPartnerFeature(createPartnerFeatureDto)).rejects.toThrow();
     });
   });
   describe('getAutomaticAccessCodeFeatureForPartner', () => {
@@ -106,7 +106,7 @@ describe('PartnerFeatureService', () => {
     });
     it('when supplied with incorrect partner name, it should throw', async () => {
       jest.spyOn(mockPartnerService, 'getPartner').mockImplementationOnce(() => undefined);
-      await expect(service.getAutomaticAccessCodeFeatureForPartner('Badoo')).rejects.toThrowError(
+      await expect(service.getAutomaticAccessCodeFeatureForPartner('Badoo')).rejects.toThrow(
         'Unable to find partner with that name',
       );
     });
@@ -130,7 +130,7 @@ describe('PartnerFeatureService', () => {
 
       await expect(
         service.updatePartnerFeature('partnerFeatureId', { active: false }),
-      ).rejects.toThrowError('Error unable to update');
+      ).rejects.toThrow('Error unable to update');
     });
   });
 });

src/user/user.service.spec.ts

@@ -124,9 +124,9 @@ describe('UserService', () => {
       expect(user.user.email).toBe('[email protected]');
       expect(user.partnerAdmin).toBeUndefined();
       expect(user.partnerAccesses).toBe(undefined);
-      expect(repoSpyCreate).toBeCalledWith(createUserRepositoryDto);
-      expect(repoSpySave).toBeCalled();
-      expect(addCrispProfile).toBeCalledWith({
+      expect(repoSpyCreate).toHaveBeenCalledWith(createUserRepositoryDto);
+      expect(repoSpySave).toHaveBeenCalled();
+      expect(addCrispProfile).toHaveBeenCalledWith({
         email: user.user.email,
         person: { nickname: 'name' },
         segments: ['public'],
@@ -155,11 +155,11 @@ describe('UserService', () => {
         { ...partnerAccessData, therapySessions: therapySession },
       ]);
 
-      expect(repoSpyCreate).toBeCalledWith(createUserRepositoryDto);
-      expect(partnerAccessSpy).toBeCalled();
-      expect(repoSpySave).toBeCalled();
+      expect(repoSpyCreate).toHaveBeenCalledWith(createUserRepositoryDto);
+      expect(partnerAccessSpy).toHaveBeenCalled();
+      expect(repoSpySave).toHaveBeenCalled();
 
-      expect(addCrispProfile).toBeCalledWith({
+      expect(addCrispProfile).toHaveBeenCalledWith({
         email: user.user.email,
         person: { nickname: 'name' },
         segments: ['bumble'],
@@ -177,8 +177,8 @@ describe('UserService', () => {
       await expect(async () => {
         await service.createUser({ ...createUserDto, partnerAccessCode: '123456' });
       }).rejects.toThrow(PartnerAccessCodeStatusEnum.ALREADY_IN_USE);
-      expect(userRepoSpy).toBeCalledTimes(0);
-      expect(assignCodeSpy).toBeCalledTimes(0);
+      expect(userRepoSpy).not.toHaveBeenCalled();
+      expect(assignCodeSpy).not.toHaveBeenCalled();
     });
     // TODO - what do we want to happen here?
     it('when supplied with user dto and partner access that is incorrect, it should throw an error', async () => {
@@ -190,8 +190,8 @@ describe('UserService', () => {
         });
       await expect(
         service.createUser({ ...createUserDto, partnerAccessCode: 'incorrect code' }),
-      ).rejects.toThrowError('Access code invalid');
-      expect(userRepoSpy).toBeCalledTimes(0);
+      ).rejects.toThrow('Access code invalid');
+      expect(userRepoSpy).not.toHaveBeenCalled();
     });
 
     it('when supplied with user dto and partnerId but no partner access code, it should return a user with partner access', async () => {
@@ -250,8 +250,8 @@ describe('UserService', () => {
       expect(user.contactPermission).toBe(true);
       expect(user.serviceEmailsPermission).toBe(false);
 
-      expect(repoSpySave).toBeCalledWith({ ...mockUserEntity, ...updateUserDto });
-      expect(repoSpySave).toBeCalled();
+      expect(repoSpySave).toHaveBeenCalledWith({ ...mockUserEntity, ...updateUserDto });
+      expect(repoSpySave).toHaveBeenCalled();
     });
   });
 
@@ -274,7 +274,7 @@ describe('UserService', () => {
       expect(user.name).not.toBe(mockUserEntity.name);
       expect(user.email).not.toBe(mockUserEntity.email);
 
-      expect(repoSpySave).toBeCalled();
+      expect(repoSpySave).toHaveBeenCalled();
     });
   });