.eslintrc.js

@@ -4,8 +4,13 @@ module.exports = {
     project: true,
     sourceType: 'module',
   },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: ['plugin:@typescript-eslint/recommended', 'prettier/@typescript-eslint', 'plugin:prettier/recommended'],
+  plugins: ['@typescript-eslint/eslint-plugin', 'jest'],
+  extends: [
+    'plugin:@typescript-eslint/recommended',
+    'prettier/@typescript-eslint',
+    'plugin:prettier/recommended',
+    'plugin:jest/recommended',
+  ],
   root: true,
   env: {
     node: true,
@@ -16,5 +21,7 @@ module.exports = {
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'warn',
+
+    'jest/no-conditional-expect': 'off',
   },
 };

package.json

@@ -11,7 +11,7 @@
     "doc": "./node_modules/.bin/compodoc compodoc -p tsconfig.json -s -n 'Resin api documentation'",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "init-db": "node ./scripts/init-db.js",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lint": "eslint src test -c .eslintrc.js --fix",
     "migrate:create": "migrate create --template-file ./src/migrations/migrations-utils/template.ts --migrations-dir=\"./src/migrations/scripts\" --compiler=\"ts:./src/migrations/migrations-utils/ts-compiler.js\"",
     "migrate:down": "migrate --migrations-dir=\"./src/migrations/scripts\" --compiler=\"ts:./src/migrations/migrations-utils/ts-compiler.js\" down",
     "migrate:up": "migrate --migrations-dir=\"./src/migrations/scripts\" --compiler=\"ts:./src/migrations/migrations-utils/ts-compiler.js\" up",
@@ -50,6 +50,7 @@
     "class-validator": "^0.13.2",
     "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
+    "eslint-plugin-jest": "^27.6.1",
     "form-data": "^4.0.0",
     "lodash": "^4.17.21",
     "luxon": "^1.25.0",

src/admin/admin.controller.spec.ts

@@ -225,8 +225,8 @@ describe('AdminController', () => {
         userId: mockUserId,
         employerId: String(mockEmployer._id),
       });
-      expect(spyer).toBeCalledTimes(1);
-      expect(spyer).toBeCalledWith(mockUserId, mockEmployer);
+      expect(spyer).toHaveBeenCalledTimes(1);
+      expect(spyer).toHaveBeenCalledWith(mockUserId, mockEmployer);
       expect(reply).toBeTruthy();
     });
 
@@ -246,7 +246,7 @@ describe('AdminController', () => {
         });
         expect(true).toBe(false);
       } catch (e) {
-        expect(spyer).toBeCalledTimes(0);
+        expect(spyer).toHaveBeenCalledTimes(0);
         expect(e.message).toBe('Employer does not exist');
         expect(e.status).toBe(400);
       }
@@ -268,7 +268,7 @@ describe('AdminController', () => {
         });
         expect(true).toBe(false);
       } catch (e) {
-        expect(spyer).toBeCalledTimes(0);
+        expect(spyer).toHaveBeenCalledTimes(0);
         expect(e.message).toBe('User does not exist');
         expect(e.status).toBe(400);
       }
@@ -289,8 +289,8 @@ describe('AdminController', () => {
         userId: mockUserId,
         jobId: String(mockJob._id),
       });
-      expect(spyer).toBeCalledTimes(1);
-      expect(spyer).toBeCalledWith(mockUserId, mockJob);
+      expect(spyer).toHaveBeenCalledTimes(1);
+      expect(spyer).toHaveBeenCalledWith(mockUserId, mockJob);
       expect(reply).toBeTruthy();
     });
 
@@ -310,7 +310,7 @@ describe('AdminController', () => {
         });
         expect(true).toBe(false);
       } catch (e) {
-        expect(spyer).toBeCalledTimes(0);
+        expect(spyer).toHaveBeenCalledTimes(0);
         expect(e.message).toBe('Job does not exist');
         expect(e.status).toBe(400);
       }
@@ -332,7 +332,7 @@ describe('AdminController', () => {
         });
         expect(true).toBe(false);
       } catch (e) {
-        expect(spyer).toBeCalledTimes(0);
+        expect(spyer).toHaveBeenCalledTimes(0);
         expect(e.message).toBe('User does not exist');
         expect(e.status).toBe(400);
       }

src/contact/contact.controller.spec.ts

@@ -33,7 +33,7 @@ describe('ContactController', () => {
   it('should call sendMessage', async () => {
     const spyer = jest.spyOn(contactServiceMock, 'sendMessage');
     await contactController.sendContactMessage({ contactMessage: new ContactMessage() });
-    expect(spyer).toBeCalledTimes(1);
-    expect(spyer).toBeCalledWith(new ContactMessage());
+    expect(spyer).toHaveBeenCalledTimes(1);
+    expect(spyer).toHaveBeenCalledWith(new ContactMessage());
   });
 });

src/newsletter/newsletter.service.spec.ts

@@ -61,7 +61,7 @@ describe('NewsletterService', () => {
   });
 
   describe('newsletterSubscribe', () => {
-    it('it should add subscription for email test2@test.com even if it exists', async () => {
+    it('should add subscription for email test2@test.com even if it exists', async () => {
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' } as INewsletterSubscription;
       mailchimp.lists.setListMember.mockResolvedValueOnce({ email_address: 'test2@test.com' });
       mailchimp.lists.updateListMemberTags.mockResolvedValueOnce({});
@@ -73,7 +73,7 @@ describe('NewsletterService', () => {
       const subscription = await newsletterService.newsletterSubscribe('test2@test.com');
       expect(subscription).toEqual(_doc);
     });
-    it('it should add a subscription for email test2@test.com', async () => {
+    it('should add a subscription for email test2@test.com', async () => {
       const result = { email: 'test2@test.com' } as INewsletterSubscription;
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' };
       mailchimp.lists.setListMember.mockResolvedValueOnce({ email_address: 'test2@test.com' });
@@ -87,7 +87,7 @@ describe('NewsletterService', () => {
       const subscription = await newsletterService.newsletterSubscribe('test2@test.com');
       expect(subscription).toEqual(_doc);
     });
-    it('it should return error if mailchimp 400 issue', async () => {
+    it('should return error if mailchimp 400 issue', async () => {
       const result = { email: 'test2@test.com' } as INewsletterSubscription;
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' };
       mailchimp.lists.setListMember.mockRejectedValueOnce({ status: 400 });
@@ -106,7 +106,7 @@ describe('NewsletterService', () => {
         expect(e.status).toEqual(HttpStatus.BAD_REQUEST);
       }
     });
-    it('it should return error if mailchimp 500 issue', async () => {
+    it('should return error if mailchimp 500 issue', async () => {
       const result = { email: 'test2@test.com' } as INewsletterSubscription;
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' };
       mailchimp.lists.setListMember.mockRejectedValueOnce({ status: 500 });
@@ -127,7 +127,7 @@ describe('NewsletterService', () => {
     });
   });
   describe('newsletterUnsubscribe', () => {
-    it('it should not remove subscription for email test@test.com : does not exist', async () => {
+    it('should not remove subscription for email test@test.com : does not exist', async () => {
       mailchimp.lists.getListMember.mockRejectedValueOnce({ status: 404 });
       mockNewsletterModel.findOne.mockReturnThis();
       mockNewsletterModel.exec.mockResolvedValueOnce(undefined);
@@ -140,7 +140,7 @@ describe('NewsletterService', () => {
         expect(e.status).toEqual(HttpStatus.NOT_FOUND);
       }
     });
-    it('it should remove a subscription for email test2@test.com', async () => {
+    it('should remove a subscription for email test2@test.com', async () => {
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' };
       mailchimp.lists.getListMember.mockResolvedValueOnce({ email_address: 'test2@test.com' });
       mailchimp.lists.setListMember.mockResolvedValueOnce({ email_address: 'test2@test.com' });
@@ -158,13 +158,13 @@ describe('NewsletterService', () => {
   });
 
   describe('findOne', () => {
-    it('it should not find a subscription with email test@test.com', async () => {
+    it('should not find a subscription with email test@test.com', async () => {
       mockNewsletterModel.findOne.mockReturnThis();
       mockNewsletterModel.exec.mockResolvedValueOnce(undefined);
       const findOneEmail = await newsletterService.findOne('test@test.com');
       expect(findOneEmail).toEqual(undefined);
     });
-    it('it should find a subscription with email test2@test.com', async () => {
+    it('should find a subscription with email test2@test.com', async () => {
       const _doc = { _id: 'a1aaaaa1a1', email: 'test2@test.com' } as INewsletterSubscription;
       mockNewsletterModel.findOne.mockReturnThis();
       mockNewsletterModel.exec.mockResolvedValueOnce(_doc);
@@ -173,7 +173,7 @@ describe('NewsletterService', () => {
     });
   });
   describe('findAll', () => {
-    it('it should find all', async () => {
+    it('should find all', async () => {
       const _docs = [{ _id: 'a1aaaaa1a1', email: 'test2@test.com' } as INewsletterSubscription];
       mockNewsletterModel.find.mockReturnThis();
       mockNewsletterModel.exec.mockResolvedValueOnce(_docs);
@@ -194,7 +194,7 @@ describe('NewsletterService', () => {
       mockNewsletterModel.findOne.mockReturnThis();
       mockNewsletterModel.exec.mockResolvedValueOnce(result).mockResolvedValueOnce(null);
       await newsletterService.updateNewsletterSubscription();
-      expect(mockNewsletterModel.findOne).toBeCalledTimes(2);
+      expect(mockNewsletterModel.findOne).toHaveBeenCalledTimes(2);
       // Remove subscription is not tested
       // expect(spyerDelete).toBeCalledTimes(1);
     });

src/parameters/parameters.controller.spec.ts

@@ -37,22 +37,22 @@ describe('ParametersController', () => {
   it('should call getParameters', async () => {
     const spyer = jest.spyOn(parametersServiceMock, 'getParameters');
     await parametersController.getParameters();
-    expect(spyer).toBeCalledTimes(1);
+    expect(spyer).toHaveBeenCalledTimes(1);
   });
 
   describe('setParameterLockdownInfoDisplay', () => {
     const spyer = jest.spyOn(parametersServiceMock, 'setParameterLockdownInfoDisplay');
     afterEach(() => spyer.mockClear());
-    it('should call setParameterLockdownInfoDisplay(false) ', async () => {
+    it('should call setParameterLockdownInfoDisplay(false)', async () => {
       await parametersController.setParameterLockdownInfoDisplay({ lockdownInfoDisplay: false });
-      expect(spyer).toBeCalledTimes(1);
-      expect(spyer).toBeCalledWith(false);
+      expect(spyer).toHaveBeenCalledTimes(1);
+      expect(spyer).toHaveBeenCalledWith(false);
     });
 
     it('should call setParameterLockdownInfoDisplay(true)', async () => {
       await parametersController.setParameterLockdownInfoDisplay({ lockdownInfoDisplay: true });
-      expect(spyer).toBeCalledTimes(1);
-      expect(spyer).toBeCalledWith(true);
+      expect(spyer).toHaveBeenCalledTimes(1);
+      expect(spyer).toHaveBeenCalledWith(true);
     });
   });
 });

src/parameters/parameters.service.spec.ts

@@ -40,7 +40,7 @@ describe('ParametersService', () => {
       parametersModelMock.exec.mockResolvedValueOnce({ lockdownInfoDisplay: false });
 
       const result = await parametersService.getParameters();
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
       expect(result).toEqual({ lockdownInfoDisplay: false });
     });
 
@@ -56,7 +56,7 @@ describe('ParametersService', () => {
         expect(error.message).toBe('Parameters not found');
         expect(error.status).toBe(HttpStatus.NOT_FOUND);
       }
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -67,7 +67,7 @@ describe('ParametersService', () => {
       parametersModelMock.exec.mockResolvedValueOnce({ lockdownInfoDisplay: false, save: jest.fn() });
 
       const result = await parametersService.setParameterLockdownInfoDisplay(true);
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
       expect(result.lockdownInfoDisplay).toEqual(true);
     });
 
@@ -83,7 +83,7 @@ describe('ParametersService', () => {
         expect(error.message).toBe('Parameters not found');
         expect(error.status).toBe(HttpStatus.NOT_FOUND);
       }
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 });

src/structures/services/structures-import.service.spec.ts

@@ -104,10 +104,10 @@ describe('StructuresImportService', () => {
 
       await structuresImportService.importDataGouvStructures();
 
-      expect(httpServiceMock.get).toBeCalled();
-      expect(formatToResinSchemaSpy).toBeCalled();
-      expect(doesAlreadyExistSpy).toBeCalled();
-      expect(saveSpy).toBeCalled();
+      expect(httpServiceMock.get).toHaveBeenCalled();
+      expect(formatToResinSchemaSpy).toHaveBeenCalled();
+      expect(doesAlreadyExistSpy).toHaveBeenCalled();
+      expect(saveSpy).toHaveBeenCalled();
     });
   });
 

src/structures/services/structures.service.spec.ts

@@ -290,9 +290,9 @@ describe('StructuresService', () => {
 
   it('should Initiate structure index', async () => {
     await structureService.initiateStructureIndex();
-    expect(mockStructuresSearchService.createStructureIndex).toBeCalledTimes(1);
-    expect(mockStructuresSearchService.dropIndex).toBeCalledTimes(1);
-    expect(mockStructuresSearchService.indexStructure).toBeCalledTimes(1);
+    expect(mockStructuresSearchService.createStructureIndex).toHaveBeenCalledTimes(1);
+    expect(mockStructuresSearchService.dropIndex).toHaveBeenCalledTimes(1);
+    expect(mockStructuresSearchService.indexStructure).toHaveBeenCalledTimes(1);
   });
 
   describe('searchForStructures', () => {
@@ -622,7 +622,7 @@ describe('StructuresService', () => {
       mockStructureModel.findByIdAndUpdate.mockReturnThis();
       mockStructureModel.exec.mockImplementation(() => null);
       await structureService.restoreStructure('someId');
-      expect(mockStructureModel.findByIdAndUpdate).toBeCalled();
+      expect(mockStructureModel.findByIdAndUpdate).toHaveBeenCalled();
     });
   });
 

src/structures/services/structures.service.ts

@@ -551,7 +551,7 @@ export class StructuresService {
           const communes = res.data.filter((commune) => commune.nomCommune == structure.address.commune);
           if (communes.length) {
             this.logger.debug(`Insee code ${communes[0].codeCommune} for ${structure.address.commune}`);
-            inseeCode = res.data[0].codeCommune;
+            inseeCode = communes[0].codeCommune;
           } else {
             this.logger.warn(
               `Commune not found for ${structure.address.commune} in ${JSON.stringify(res.data)} (${req})`

src/structures/structures.controller.spec.ts

@@ -130,7 +130,7 @@ describe('StructuresController', () => {
       structure: structureDtoMock,
     };
     await structuresController.create(structure);
-    expect(mockStructureService.create).toBeCalled();
+    expect(mockStructureService.create).toHaveBeenCalled();
   });
 
   it('should update structure', async () => {
@@ -140,7 +140,7 @@ describe('StructuresController', () => {
       dataShareConsentDate: null,
       personalOffers: [],
     });
-    expect(mockStructureService.update).toBeCalled();
+    expect(mockStructureService.update).toHaveBeenCalled();
   });
 
   it('should findAll', async () => {
@@ -160,13 +160,13 @@ describe('StructuresController', () => {
 
   it('should search structure', async () => {
     await structuresController.search({ query: 'test', filters: [] }, null);
-    expect(mockStructureService.searchForStructures).toBeCalled();
+    expect(mockStructureService.searchForStructures).toHaveBeenCalled();
   });
 
   it('should reset Search Index', async () => {
     await structuresController.resetES();
-    expect(mockStructureService.updateAllDenormalizedFields).toBeCalled();
-    expect(mockStructureService.initiateStructureIndex).toBeCalled();
+    expect(mockStructureService.updateAllDenormalizedFields).toHaveBeenCalled();
+    expect(mockStructureService.initiateStructureIndex).toHaveBeenCalled();
   });
 
   it('should claim structure', async () => {
@@ -207,7 +207,7 @@ describe('StructuresController', () => {
 
   it('should search an address', async () => {
     await structuresController.searchAddress({ searchQuery: 'Rue Alphonse Daudet' });
-    expect(mockStructureService.searchAddress).toBeCalled();
+    expect(mockStructureService.searchAddress).toHaveBeenCalled();
   });
 
   describe('find(structureId)', () => {
@@ -294,8 +294,8 @@ describe('StructuresController', () => {
       mockUsersService.findById.mockResolvedValue(mockUser);
       mockUsersService.getPersonalOfferInStructure.mockReturnValue(null);
       await structuresController.removeOwner('6093ba0e2ab5775cfc01ed3e', '63639058685ba134c32bc495');
-      expect(mockUsersService.removeFromStructureLinked).toBeCalledTimes(1);
-      expect(mockPersonalOffersService.delete).toBeCalledTimes(0);
+      expect(mockUsersService.removeFromStructureLinked).toHaveBeenCalledTimes(1);
+      expect(mockPersonalOffersService.delete).toHaveBeenCalledTimes(0);
     });
 
     it('should remove structure link with offer', async () => {
@@ -313,8 +313,8 @@ describe('StructuresController', () => {
       });
 
       await structuresController.removeOwner('6093ba0e2ab5775cfc01ed3e', '63639058685ba134c32bc495');
-      expect(mockUsersService.removeFromStructureLinked).toBeCalled();
-      expect(mockPersonalOffersService.delete).toBeCalled();
+      expect(mockUsersService.removeFromStructureLinked).toHaveBeenCalled();
+      expect(mockPersonalOffersService.delete).toHaveBeenCalled();
     });
 
     it('should remove user from struct', async () => {
@@ -322,7 +322,7 @@ describe('StructuresController', () => {
       mockUsersService.findById.mockResolvedValue(mockUser);
       mockUsersService.getPersonalOfferInStructure.mockReturnValue(null);
       await structuresController.removeOwner('6093ba0e2ab5775cfc01ed3e', '63639058685ba134c32bc495');
-      expect(mockUsersService.removeFromStructureLinked).toBeCalled();
+      expect(mockUsersService.removeFromStructureLinked).toHaveBeenCalled();
     });
 
     // test personal offers delete
@@ -338,6 +338,6 @@ describe('StructuresController', () => {
 
   it('should report any structure error', async () => {
     await structuresController.reportStructureError({ structureId: '6093ba0e2ab5775cfc01ed3e', content: null });
-    expect(mockStructureService.reportStructureError).toBeCalled();
+    expect(mockStructureService.reportStructureError).toHaveBeenCalled();
   });
 });

src/users/controllers/employer.controller.spec.ts

@@ -59,7 +59,7 @@ describe('EmployerController', () => {
   });
 
   describe('findAll', () => {
-    it('should return two elements ', async () => {
+    it('should return two elements', async () => {
       employerServiceMock.findAll.mockResolvedValueOnce([
         {
           _id: new Types.ObjectId('6231aefe76598527c8d0b5a7'),

src/users/controllers/users.controller.spec.ts

@@ -264,12 +264,12 @@ describe('UsersController', () => {
       userServiceMock.create.mockResolvedValueOnce(usersMockData[0]);
       const result = await usersController.create(createUserDto);
 
-      expect(userCreateSpyer).toBeCalledTimes(1);
-      expect(structureFindOneSpyer).toBeCalledTimes(0);
-      expect(updateStructureLinkedClaimSpyer).toBeCalledTimes(0);
-      expect(sendAdminStructureNotificationSpyer).toBeCalledTimes(0);
-      expect(tempUserFindOneSpyer).toBeCalledTimes(1);
-      expect(tempUserDeleteSpyer).toBeCalledTimes(0);
+      expect(userCreateSpyer).toHaveBeenCalledTimes(1);
+      expect(structureFindOneSpyer).toHaveBeenCalledTimes(0);
+      expect(updateStructureLinkedClaimSpyer).toHaveBeenCalledTimes(0);
+      expect(sendAdminStructureNotificationSpyer).toHaveBeenCalledTimes(0);
+      expect(tempUserFindOneSpyer).toHaveBeenCalledTimes(1);
+      expect(tempUserDeleteSpyer).toHaveBeenCalledTimes(0);
       expect(result).toEqual(usersMockData[0]);
     });
 
@@ -286,12 +286,12 @@ describe('UsersController', () => {
       tempUserServiceMock.findOne.mockResolvedValueOnce({ email: 'test@test.com', pendingStructuresLink: [] });
       const result = await usersController.create(createUserDto);
 
-      expect(userCreateSpyer).toBeCalledTimes(1);
-      expect(structureFindOneSpyer).toBeCalledTimes(0);
-      expect(updateStructureLinkedClaimSpyer).toBeCalledTimes(0);
-      expect(sendAdminStructureNotificationSpyer).toBeCalledTimes(0);
-      expect(tempUserFindOneSpyer).toBeCalledTimes(1);
-      expect(tempUserDeleteSpyer).toBeCalledTimes(1);
+      expect(userCreateSpyer).toHaveBeenCalledTimes(1);
+      expect(structureFindOneSpyer).toHaveBeenCalledTimes(0);
+      expect(updateStructureLinkedClaimSpyer).toHaveBeenCalledTimes(0);
+      expect(sendAdminStructureNotificationSpyer).toHaveBeenCalledTimes(0);
+      expect(tempUserFindOneSpyer).toHaveBeenCalledTimes(1);
+      expect(tempUserDeleteSpyer).toHaveBeenCalledTimes(1);
       expect(result).toEqual(usersMockData[0]);
     });
   });
@@ -300,7 +300,7 @@ describe('UsersController', () => {
     it('should call validateUser', async () => {
       const spyer = jest.spyOn(userServiceMock, 'validateUser');
       await usersController.validateUser({ id: 1 }, 'token');
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -308,7 +308,7 @@ describe('UsersController', () => {
     it('should call changeUserPassword', async () => {
       const spyer = jest.spyOn(userServiceMock, 'changeUserPassword');
       await usersController.changePassword({ user: { _id: '36', email: 'a@a.com' } }, new PasswordChangeDto());
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -316,7 +316,7 @@ describe('UsersController', () => {
     it('should call changeUserEmail', async () => {
       const spyer = jest.spyOn(userServiceMock, 'changeUserEmail');
       await usersController.changeEmail(new EmailChangeDto());
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -324,7 +324,7 @@ describe('UsersController', () => {
     it('should call verifyAndUpdateUserEmail', async () => {
       const spyer = jest.spyOn(userServiceMock, 'verifyAndUpdateUserEmail');
       await usersController.verifyAndUpdateEmail('token');
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -332,7 +332,7 @@ describe('UsersController', () => {
     it('should call sendResetPasswordEmail', async () => {
       const spyer = jest.spyOn(userServiceMock, 'sendResetPasswordEmail');
       await usersController.resetPassword(new PasswordResetDto());
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -340,7 +340,7 @@ describe('UsersController', () => {
     it('should call validatePasswordResetToken', async () => {
       const spyer = jest.spyOn(userServiceMock, 'validatePasswordResetToken');
       await usersController.resetPasswordApply(new PasswordResetApplyDto());
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -348,7 +348,7 @@ describe('UsersController', () => {
     it('should call verifyUserExist', async () => {
       const spyer = jest.spyOn(userServiceMock, 'verifyUserExist');
       await usersController.verifyUserExist({ user: { _id: '36', email: 'a@a.com' } }, { newMail: 'test@test.com' });
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -359,8 +359,8 @@ describe('UsersController', () => {
       const userWithoutStructure = usersMockData[2];
       userServiceMock.deleteOne.mockResolvedValueOnce(userWithoutStructure);
       await usersController.delete({ user: { _id: '36', email: 'a@a.com' } });
-      expect(deleteOneSpyer).toBeCalledTimes(1);
-      expect(isStructureClaimedSpyer).toBeCalledTimes(0);
+      expect(deleteOneSpyer).toHaveBeenCalledTimes(1);
+      expect(isStructureClaimedSpyer).toHaveBeenCalledTimes(0);
     });
 
     it('should call isStructureClaimed for each structure linked', async () => {
@@ -372,9 +372,9 @@ describe('UsersController', () => {
       userServiceMock.isStructureClaimed.mockResolvedValue(null);
       userServiceMock.isStructureClaimed.mockResolvedValueOnce(userWithThreeStructures);
       await usersController.delete({ user: { _id: '36', email: 'a@a.com' } });
-      expect(userDeleteOneSpyer).toBeCalledTimes(1);
-      expect(isStructureClaimedSpyer).toBeCalledTimes(3);
-      expect(structureFindOne).toBeCalledTimes(2);
+      expect(userDeleteOneSpyer).toHaveBeenCalledTimes(1);
+      expect(isStructureClaimedSpyer).toHaveBeenCalledTimes(3);
+      expect(structureFindOne).toHaveBeenCalledTimes(2);
     });
   });
 
@@ -382,7 +382,7 @@ describe('UsersController', () => {
     it('should call getAllDataConsentPendingStructures', async () => {
       const spyer = jest.spyOn(structureServiceMock, 'getAllDataConsentPendingStructures');
       await usersController.dataConsentValidation({ user: { _id: '36', email: 'a@a.com' } });
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -392,7 +392,7 @@ describe('UsersController', () => {
       userServiceMock.findById.mockResolvedValueOnce({ _id: '36', email: 'a@a.com' });
       const result = await usersController.getUser(1);
       expect(result).toEqual({ _id: '36', email: 'a@a.com' });
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
 
     it('should throw error if no user found', async () => {
@@ -406,7 +406,7 @@ describe('UsersController', () => {
         expect(error.message).toBe('User does not exist');
         expect(error.status).toBe(HttpStatus.NOT_FOUND);
       }
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -414,7 +414,7 @@ describe('UsersController', () => {
     it('should call updateDescription', async () => {
       const spyer = jest.spyOn(userServiceMock, 'updateDescription');
       await usersController.updateDescription({ user: { _id: '36', email: 'a@a.com' } }, new DescriptionDto());
-      expect(spyer).toBeCalledTimes(1);
+      expect(spyer).toHaveBeenCalledTimes(1);
     });
   });
 });

src/users/guards/isPersonalOfferOwner.guard.spec.ts

@@ -99,6 +99,6 @@ describe('isPersonalOfferOwner', () => {
     const result = await guard.canActivate(context);
 
     expect(result).toBeFalsy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 });

src/users/guards/isStructureOwner.guard.spec.ts

@@ -99,6 +99,6 @@ describe('isStrructureOwner', () => {
     const result = await guard.canActivate(context);
 
     expect(result).toBeFalsy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 });

src/users/guards/roles.guard.spec.ts

@@ -42,7 +42,7 @@ describe('RolesGuard', () => {
     const result = await guard.canActivate(context);
 
     expect(result).toBeTruthy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 
   it('should return true if the `HasRoles` decorator and role is admin', async () => {
@@ -58,7 +58,7 @@ describe('RolesGuard', () => {
 
     const result = await guard.canActivate(context);
     expect(result).toBeTruthy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 
   it('should return false if the `HasRoles` decorator is set but role is not allowed', async () => {
@@ -74,7 +74,7 @@ describe('RolesGuard', () => {
 
     const result = await guard.canActivate(context);
     expect(result).toBeFalsy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 
   it('should return true if the `HasRoles` decorator is and role is not allowed', async () => {
@@ -90,6 +90,6 @@ describe('RolesGuard', () => {
 
     const result = await guard.canActivate(context);
     expect(result).toBeTruthy();
-    expect(reflector.get).toBeCalled();
+    expect(reflector.get).toHaveBeenCalled();
   });
 });

src/users/services/employer.service.spec.ts

@@ -184,7 +184,7 @@ describe('EmployerService', () => {
       jest.spyOn(employerService, 'sendAdminCreateNotification').mockResolvedValueOnce();
       const reply = await employerService.create(createEmployer);
       expect(reply).toBeTruthy();
-      expect(employerService.sendAdminCreateNotification).toBeCalledTimes(1);
+      expect(employerService.sendAdminCreateNotification).toHaveBeenCalledTimes(1);
     });
 
     it('should create validated employer and not send email to admins', async () => {
@@ -406,7 +406,7 @@ describe('EmployerService', () => {
   });
 
   describe('deleteOneId', () => {
-    it('should delete ', async () => {
+    it('should delete', async () => {
       mockEmployerModel.findOne.mockReturnThis();
       mockEmployerModel.exec.mockResolvedValueOnce({
         _id: '6231aefe76598527c8d0b5bc',
@@ -445,7 +445,7 @@ describe('EmployerService', () => {
         personalOffers: [],
       });
     });
-    it('should throw an error ', async () => {
+    it('should throw an error', async () => {
       mockEmployerModel.findOne.mockReturnThis();
       mockEmployerModel.exec.mockResolvedValueOnce(null);
 

src/users/services/jobs.service.spec.ts

@@ -219,7 +219,7 @@ describe('JobsService', () => {
       };
       mockUserService.getAdmins.mockResolvedValueOnce(mockSingleAdminResponse);
       await jobsService.sendAdminCreateNotification(job as JobDocument, 'adminJobCreate.ejs', 'adminJobCreate.json');
-      expect(mockMailService.send).toBeCalledTimes(1);
+      expect(mockMailService.send).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -325,7 +325,7 @@ describe('JobsService', () => {
   });
 
   describe('deleteOneId', () => {
-    it('should delete ', async () => {
+    it('should delete', async () => {
       mockJobModel.exec.mockResolvedValueOnce({
         _id: new Types.ObjectId('623aed68c5d45b6fbbaa7e60'),
         name: 'Dev',
@@ -335,7 +335,7 @@ describe('JobsService', () => {
       const reply = await jobsService.deleteOneId('623aed68c5d45b6fbbaa7e60');
       expect(reply).toBe('toto');
     });
-    it('should delete ', async () => {
+    it('should delete', async () => {
       mockJobModel.exec.mockResolvedValueOnce(null);
       try {
         await jobsService.deleteOneId('623aed68c5d45b6fbbaa7e60');

src/users/services/userRegistry-search.service.spec.ts

@@ -61,7 +61,7 @@ describe('UserRegistrySearchService Search cases', () => {
       jest.spyOn(ElasticsearchService.prototype, 'delete').mockImplementation(mockDelete);
       const resAdm = await userRegistrySearchService.search('adm');
       await userRegistrySearchService.deleteIndex(resAdm[0] as IUserRegistry);
-      expect(mockDelete).toBeCalled();
+      expect(mockDelete).toHaveBeenCalled();
     });
   });
 });