fix: file, folder, keyserver spec files

internxt · Dec 5, 2023 · 8bba19e · 8bba19e
1 parent eeb4e00
commit 8bba19e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/src/modules/file/file.usecase.spec.ts b/src/modules/file/file.usecase.spec.ts
@@ -487,15 +487,15 @@ describe('FileUseCases', () => {
         folderId,
       });
 
-      const { user, ...expectedFiles } = fileAttributes;
+      delete fileAttributes['user'];
 
       const result = service.decrypFileName(file);
 
       expect(result).toStrictEqual({
-        ...expectedFiles,
-        name: fileAttributes['name'],
+        ...fileAttributes,
         shares: undefined,
         thumbnails: undefined,
+        sharings: undefined,
         folderId,
       });
     });

diff --git a/src/modules/folder/folder.usecase.spec.ts b/src/modules/folder/folder.usecase.spec.ts
@@ -133,7 +133,13 @@ describe('FolderUseCases', () => {
         removed: false,
         removedAt: null,
       });
-      jest.spyOn(folderRepository, 'findById').mockResolvedValue(mockFolder);
+      jest
+        .spyOn(folderRepository, 'findById')
+        .mockResolvedValueOnce(mockFolder);
+      jest
+        .spyOn(cryptoService, 'decryptName')
+        .mockResolvedValueOnce('a descrypt name' as never);
+
       const findDeletedFolders: FolderOptions['deleted'] = false;
       const result = await service.getFolder(folderId, {
         deleted: findDeletedFolders,
@@ -466,7 +472,7 @@ describe('FolderUseCases', () => {
       };
       delete expectedResult.parentId;
 
-      expect(result).toStrictEqual(expectedResult);
+      expect(result).toStrictEqual({ ...expectedResult, sharings: undefined });
     });
 
     it('fails when the folder name is not encrypted', () => {

diff --git a/src/modules/keyserver/key-server.usecase.spec.ts b/src/modules/keyserver/key-server.usecase.spec.ts
@@ -1,33 +1,17 @@
-import { Test, TestingModule } from '@nestjs/testing';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { Keys, KeyServer } from './key-server.domain';
 import { SequelizeKeyServerRepository } from './key-server.repository';
 import { KeyServerUseCases } from './key-server.usecase';
 
 describe('Key Server Use Cases', () => {
   let service: KeyServerUseCases;
-  let keyServerRepository: SequelizeKeyServerRepository;
+  let keyServerRepository: DeepMocked<SequelizeKeyServerRepository>;
 
   beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        KeyServerUseCases,
-        SequelizeKeyServerRepository,
-        {
-          provide: SequelizeKeyServerRepository,
-          useValue: {
-            findUserKeysOrCreate: () => {
-              return {};
-            },
-          },
-        },
-      ],
-    }).compile();
+    keyServerRepository = createMock<SequelizeKeyServerRepository>();
+    keyServerRepository.findUserKeysOrCreate.mockResolvedValue({} as any);
 
-    service = module.get<KeyServerUseCases>(KeyServerUseCases);
-
-    keyServerRepository = module.get<SequelizeKeyServerRepository>(
-      SequelizeKeyServerRepository,
-    );
+    service = new KeyServerUseCases(keyServerRepository);
   });
 
   it('is be defined', () => {
@@ -59,7 +43,7 @@ describe('Key Server Use Cases', () => {
 
       await service.addKeysToUser(userId, keys);
 
-      expect(keyServerRepository.findUserKeysOrCreate).toBeCalledTimes(1);
+      expect(keyServerRepository.findUserKeysOrCreate).toHaveBeenCalledTimes(1);
       expect(keyServerRepository.findUserKeysOrCreate).toHaveBeenCalledWith(
         userId,
         {
@@ -102,7 +86,9 @@ describe('Key Server Use Cases', () => {
 
         await service.addKeysToUser(userId, keys);
 
-        expect(keyServerRepository.findUserKeysOrCreate).toBeCalledTimes(0);
+        expect(keyServerRepository.findUserKeysOrCreate).toHaveBeenCalledTimes(
+          0,
+        );
       },
     );
   });