diff --git a/api/src/user/controllers/role.controller.spec.ts b/api/src/user/controllers/role.controller.spec.ts index b1f1c7d3..62073080 100644 --- a/api/src/user/controllers/role.controller.spec.ts +++ b/api/src/user/controllers/role.controller.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright © 2024 Hexastack. All rights reserved. + * Copyright © 2025 Hexastack. All rights reserved. * * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. @@ -30,7 +30,7 @@ import { PermissionRepository } from '../repositories/permission.repository'; import { RoleRepository } from '../repositories/role.repository'; import { UserRepository } from '../repositories/user.repository'; import { PermissionModel } from '../schemas/permission.schema'; -import { Role, RoleModel } from '../schemas/role.schema'; +import { Role, RoleFull, RoleModel } from '../schemas/role.schema'; import { UserModel } from '../schemas/user.schema'; import { PermissionService } from '../services/permission.service'; import { RoleService } from '../services/role.service'; @@ -83,8 +83,8 @@ describe('RoleController', () => { roleService = module.get(RoleService); permissionService = module.get(PermissionService); userService = module.get(UserService); - roleAdmin = await roleService.findOne({ name: 'admin' }); - rolePublic = await roleService.findOne({ name: 'public' }); + roleAdmin = (await roleService.findOne({ name: 'admin' })) as Role; + rolePublic = (await roleService.findOne({ name: 'public' })) as Role; }); afterAll(async () => { @@ -126,7 +126,7 @@ describe('RoleController', () => { acc.push(roleWithPermissionsAndUsers); return acc; - }, []); + }, [] as RoleFull[]); expect(roleService.findAndPopulate).toHaveBeenCalledWith({}, pageQuery); expect(result).toEqualPayload(rolesWithPermissionsAndUsers); @@ -136,10 +136,10 @@ describe('RoleController', () => { describe('findOne', () => { it('should find one role', async () => { jest.spyOn(roleService, 'findOne'); - const result = await roleController.findOne(roleAdmin.id, []); + const result = (await roleController.findOne(roleAdmin.id, [])) as Role; expect(roleService.findOne).toHaveBeenCalledWith(roleAdmin.id); expect(result).toEqualPayload( - roleFixtures.find((role) => role.name === 'admin'), + roleFixtures.find((role) => role.name === 'admin') as Role, ); }); diff --git a/api/src/user/repositories/role.repository.spec.ts b/api/src/user/repositories/role.repository.spec.ts index 8ead57f6..d3338eab 100644 --- a/api/src/user/repositories/role.repository.spec.ts +++ b/api/src/user/repositories/role.repository.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright © 2024 Hexastack. All rights reserved. + * Copyright © 2025 Hexastack. All rights reserved. * * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. @@ -22,7 +22,7 @@ import { PermissionRepository } from '../repositories/permission.repository'; import { RoleRepository } from '../repositories/role.repository'; import { UserRepository } from '../repositories/user.repository'; import { PermissionModel } from '../schemas/permission.schema'; -import { Role, RoleModel } from '../schemas/role.schema'; +import { Role, RoleFull, RoleModel } from '../schemas/role.schema'; import { User, UserModel } from '../schemas/user.schema'; import { roleFixtures } from './../../utils/test/fixtures/role'; @@ -54,13 +54,13 @@ describe('RoleRepository', () => { permissionRepository = module.get(PermissionRepository); roleModel = module.get>(getModelToken('Role')); - role = await roleRepository.findOne({ name: 'admin' }); + role = (await roleRepository.findOne({ name: 'admin' })) as Role; users = (await userRepository.findAll()).filter((user) => user.roles.includes(role.id), ); - roleToDelete = await roleRepository.findOne({ + roleToDelete = (await roleRepository.findOne({ name: 'manager', - }); + })) as Role; }); afterAll(async () => { @@ -104,7 +104,7 @@ describe('RoleRepository', () => { }; acc.push(roleWithPermissionsAndUsers); return acc; - }, []); + }, [] as RoleFull[]); expect(roleModel.find).toHaveBeenCalledWith({}, undefined); expect(result).toEqualPayload(rolesWithPermissionsAndUsers); diff --git a/api/src/user/services/role.service.spec.ts b/api/src/user/services/role.service.spec.ts index 604f1c11..f16f96fc 100644 --- a/api/src/user/services/role.service.spec.ts +++ b/api/src/user/services/role.service.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright © 2024 Hexastack. All rights reserved. + * Copyright © 2025 Hexastack. All rights reserved. * * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. @@ -21,7 +21,7 @@ import { PermissionRepository } from '../repositories/permission.repository'; import { RoleRepository } from '../repositories/role.repository'; import { UserRepository } from '../repositories/user.repository'; import { Permission, PermissionModel } from '../schemas/permission.schema'; -import { Role, RoleModel } from '../schemas/role.schema'; +import { Role, RoleFull, RoleModel } from '../schemas/role.schema'; import { User, UserModel } from '../schemas/user.schema'; import { roleFixtures } from './../../utils/test/fixtures/role'; @@ -55,7 +55,7 @@ describe('RoleService', () => { userRepository = module.get(UserRepository); permissionRepository = module.get(PermissionRepository); - role = await roleRepository.findOne({ name: 'admin' }); + role = (await roleRepository.findOne({ name: 'admin' })) as Role; users = (await userRepository.findAll()).filter((user) => user.roles.includes(role.id), ); @@ -105,7 +105,7 @@ describe('RoleService', () => { }; acc.push(roleWithPermissionsAndUsers); return acc; - }, []); + }, [] as RoleFull[]); expect(roleRepository.findPageAndPopulate).toHaveBeenCalledWith( {},