Merge pull request #3956 from RedisInsight/be/feature/api-packages-jest

update jest

Author: ArtemHoruzhenko

redisinsight/api/package.json

@@ -42,6 +42,8 @@
   "resolutions": {
     "nanoid": "^3.1.31",
     "word-wrap": "1.2.4",
+    "jest/**/micromatch": "^4.0.8",
+    "ts-loader/micromatch": "^4.0.8",
     "mocha/minimatch": "^3.0.5",
     "@nestjs/platform-socket.io/socket.io": "^4.8.0",
     "**/semver": "^7.5.2",
@@ -120,7 +122,7 @@
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-sonarjs": "^0.9.1",
     "ioredis-mock": "^8.2.2",
-    "jest": "^26.6.3",
+    "jest": "^29.7.0",
     "jest-when": "^3.2.1",
     "joi": "^17.4.0",
     "mocha": "^8.4.0",
@@ -132,7 +134,7 @@
     "rimraf": "^3.0.2",
     "socket.io-mock": "^1.3.2",
     "supertest": "^4.0.2",
-    "ts-jest": "^26.1.0",
+    "ts-jest": "^29.2.5",
     "ts-loader": "^6.2.1",
     "ts-mocha": "^8.0.0",
     "ts-node": "^9.1.1",
@@ -164,8 +166,7 @@
     "moduleNameMapper": {
       "src/(.*)": "<rootDir>/$1",
       "apiSrc/(.*)": "<rootDir>/$1",
-      "tests/(.*)": "<rootDir>/__tests__/$1",
-      "axios": "axios/dist/node/axios.cjs"
+      "tests/(.*)": "<rootDir>/__tests__/$1"
     }
   }
 }

redisinsight/api/src/__mocks__/bulk-actions.ts

@@ -48,7 +48,7 @@ export const mockCombinedStream = {
 
 export const mockBulkActionOverviewMatcher = {
   ...mockBulkActionOverview,
-  duration: jasmine.any(Number),
+  duration: expect.any(Number),
 };
 
 export const mockBulkActionFilter = new BulkActionFilter();

redisinsight/api/src/modules/ai/query/ai-query.service.spec.ts

@@ -57,7 +57,7 @@ describe('AiQueryService', () => {
     clientSocket.disconnect();
     serverSocket.disconnect();
     wsServer.close();
-    httpServer.stop();
+    httpServer?.stop?.();
   });
 
   beforeEach(async () => {

redisinsight/api/src/modules/ai/query/repositories/local.ai-query.message.repository.spec.ts

@@ -51,20 +51,20 @@ describe('LocalAiQueryAuthProvider', () => {
 
     encryptionService.decrypt.mockImplementation((value) => value);
     when(encryptionService.decrypt)
-      .calledWith(mockAiQueryHumanMessageEntity.content, jasmine.anything())
+      .calledWith(mockAiQueryHumanMessageEntity.content, expect.anything())
       .mockResolvedValue(mockAiQueryHumanMessage.content)
-      .calledWith(mockAiQueryAiResponseEntity.content, jasmine.anything())
+      .calledWith(mockAiQueryAiResponseEntity.content, expect.anything())
       .mockResolvedValue(mockAiQueryAiResponse.content)
-      .calledWith(mockAiQueryAiResponseEntity.steps, jasmine.anything())
+      .calledWith(mockAiQueryAiResponseEntity.steps, expect.anything())
       .mockResolvedValue(JSON.stringify(mockAiQueryAiResponse.steps));
 
     encryptionService.encrypt.mockImplementation((value) => value);
     when(encryptionService.encrypt)
-      .calledWith(mockAiQueryHumanMessage.content, jasmine.anything())
+      .calledWith(mockAiQueryHumanMessage.content, expect.anything())
       .mockResolvedValue(mockAiQueryHumanMessageEntity.content)
-      .calledWith(mockAiQueryAiResponse.content, jasmine.anything())
+      .calledWith(mockAiQueryAiResponse.content, expect.anything())
       .mockResolvedValue(mockAiQueryAiResponseEntity.content)
-      .calledWith(JSON.stringify(mockAiQueryAiResponse.steps), jasmine.anything())
+      .calledWith(JSON.stringify(mockAiQueryAiResponse.steps), expect.anything())
       .mockResolvedValue(mockAiQueryAiResponseEntity.steps);
   });
 

redisinsight/api/src/modules/autodiscovery/autodiscovery.service.spec.ts

@@ -13,7 +13,6 @@ import {
 import { SettingsService } from 'src/modules/settings/settings.service';
 import { AutodiscoveryService } from 'src/modules/autodiscovery/autodiscovery.service';
 import { DatabaseService } from 'src/modules/database/database.service';
-import { mocked } from 'ts-jest/utils';
 import config, { Config } from 'src/utils/config';
 import { RedisClientFactory } from 'src/modules/redis/redis.client.factory';
 import { ConstantsProvider } from 'src/modules/constants/providers/constants.provider';
@@ -84,7 +83,7 @@ describe('AutodiscoveryService', () => {
     databaseService = module.get(DatabaseService);
     redisClientFactory = module.get(RedisClientFactory);
 
-    mocked(utils.convertRedisInfoReplyToObject).mockReturnValue({
+    (utils.convertRedisInfoReplyToObject as jest.Mock).mockReturnValue({
       server: {
         redis_mode: 'standalone',
       },
@@ -155,7 +154,7 @@ describe('AutodiscoveryService', () => {
     let addRedisDatabaseSpy;
 
     beforeEach(async () => {
-      mocked(getAvailableEndpoints).mockResolvedValue([]);
+      (getAvailableEndpoints as jest.Mock).mockResolvedValue([]);
       addRedisDatabaseSpy = jest.spyOn(service as any, 'addRedisDatabase');
       addRedisDatabaseSpy.mockResolvedValue(null);
     });
@@ -167,7 +166,8 @@ describe('AutodiscoveryService', () => {
     });
 
     it('should should call addRedisDatabase 2 times', async () => {
-      mocked(getAvailableEndpoints).mockResolvedValueOnce([mockAutodiscoveryEndpoint, mockAutodiscoveryEndpoint]);
+      (getAvailableEndpoints as jest.Mock)
+        .mockResolvedValueOnce([mockAutodiscoveryEndpoint, mockAutodiscoveryEndpoint]);
       await service['discoverDatabases'](mockSessionMetadata);
 
       expect(addRedisDatabaseSpy).toHaveBeenCalledTimes(2);
@@ -193,7 +193,7 @@ describe('AutodiscoveryService', () => {
     });
 
     it('should not create database if redis_mode is not standalone', async () => {
-      mocked(utils.convertRedisInfoReplyToObject).mockReturnValueOnce({
+      (utils.convertRedisInfoReplyToObject as jest.Mock).mockReturnValueOnce({
         server: {
           redis_mode: 'cluster',
         },

redisinsight/api/src/modules/autodiscovery/utils/autodiscovery.util.spec.ts

@@ -4,7 +4,6 @@ import {
 import * as os from 'os';
 import * as ch from 'child_process';
 import * as net from 'net';
-import { mocked } from 'ts-jest/utils';
 import * as events from 'events';
 import * as stream from 'stream';
 import { ChildProcess } from 'child_process';
@@ -39,17 +38,17 @@ describe('getSpawnArgs', () => {
   const getSpawnArgsTests = [
     {
       name: 'Linux',
-      before: () => mocked(os.type).mockReturnValue('Linux'),
+      before: () => (os.type as jest.Mock).mockReturnValue('Linux'),
       output: ['netstat', ['-anpt']],
     },
     {
       name: 'Darwin',
-      before: () => mocked(os.type).mockReturnValue('Darwin'),
+      before: () => (os.type as jest.Mock).mockReturnValue('Darwin'),
       output: ['netstat', ['-anvp', 'tcp']],
     },
     {
       name: 'Windows_NT',
-      before: () => mocked(os.type).mockReturnValue('Windows_NT'),
+      before: () => (os.type as jest.Mock).mockReturnValue('Windows_NT'),
       output: ['netstat.exe', ['-a', '-n', '-o']],
     },
   ];
@@ -67,8 +66,8 @@ describe('getSpawnArgs', () => {
 
 describe('getRunningProcesses', () => {
   beforeEach(() => {
-    mocked(os.type).mockReturnValue('Linux');
-    mocked(ch.spawn).mockReturnValue(mockChildProcess);
+    (os.type as jest.Mock).mockReturnValue('Linux');
+    (ch.spawn as jest.Mock).mockReturnValue(mockChildProcess);
   });
   const getRunningProcessesTests = [
     {
@@ -94,7 +93,7 @@ describe('getRunningProcesses', () => {
   });
 
   it('Should throw an error for unsupported platform', async () => {
-    mocked(os.type).mockReturnValueOnce('custom_os');
+    (os.type as jest.Mock).mockReturnValueOnce('custom_os');
 
     try {
       await autodiscoveryUtility.getRunningProcesses();
@@ -172,7 +171,7 @@ describe('getTCPEndpoints', () => {
 
 describe('testEndpoint', () => {
   beforeEach(() => {
-    mocked(net.createConnection).mockReturnValue(mockSocket);
+    (net.createConnection as jest.Mock).mockReturnValue(mockSocket);
   });
   const testEndpointTests = [
     {
@@ -224,7 +223,7 @@ describe('getAvailableEndpoints', () => {
   beforeEach(() => {
     const getRunningProcessesSpy = jest.spyOn(autodiscoveryUtility, 'getRunningProcesses');
     getRunningProcessesSpy.mockResolvedValue(['']);
-    mocked(net.createConnection).mockReturnValue(mockSocket);
+    (net.createConnection as jest.Mock).mockReturnValue(mockSocket);
   });
   const getAvailableEndpointsTests = [
     {

redisinsight/api/src/modules/browser/keys/scanner/strategies/cluster.scanner.strategy.spec.ts

@@ -776,16 +776,16 @@ describe('Cluster Scanner Strategy', () => {
     beforeEach(() => {
       when(mockClusterRedisClient.sendPipeline)
         .calledWith([
-          jasmine.arrayContaining([BrowserToolKeysCommands.Ttl]),
-          jasmine.arrayContaining(['memory', 'usage']),
-          jasmine.arrayContaining([BrowserToolKeysCommands.Type]),
+          expect.arrayContaining([BrowserToolKeysCommands.Ttl]),
+          expect.arrayContaining(['memory', 'usage']),
+          expect.arrayContaining([BrowserToolKeysCommands.Type]),
         ],
         { replyEncoding: 'utf8' })
         .mockResolvedValue([[null, -1], [null, 50], [null, 'string']]);
       when(mockClusterRedisClient.sendPipeline)
         .calledWith([
-          jasmine.arrayContaining([BrowserToolKeysCommands.Ttl]),
-          jasmine.arrayContaining(['memory', 'usage']),
+          expect.arrayContaining([BrowserToolKeysCommands.Ttl]),
+          expect.arrayContaining(['memory', 'usage']),
         ],
         { replyEncoding: 'utf8' })
         .mockResolvedValue([[null, 999], [null, 555]]);

redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts

@@ -162,11 +162,11 @@ describe('BulkImportService', () => {
       spy.mockResolvedValue(mockSummary);
       expect(await service.import(mockClientMetadata, mockReadableStream)).toEqual({
         ...mockImportResult,
-        duration: jasmine.anything(),
+        duration: expect.anything(),
       });
       expect(analytics.sendActionSucceed).toHaveBeenCalledWith({
         ...mockImportResult,
-        duration: jasmine.anything(),
+        duration: expect.anything(),
       });
     });
 
@@ -185,7 +185,7 @@ describe('BulkImportService', () => {
             failed: 0,
             errors: [],
           },
-          duration: jasmine.anything(),
+          duration: expect.anything(),
         });
     });
 
@@ -204,7 +204,7 @@ describe('BulkImportService', () => {
             failed: 0,
             errors: [],
           },
-          duration: jasmine.anything(),
+          duration: expect.anything(),
         });
     });
 
@@ -225,7 +225,7 @@ describe('BulkImportService', () => {
           failed: 2,
           errors: [],
         },
-        duration: jasmine.anything(),
+        duration: expect.anything(),
       });
       expect(mockStandaloneRedisClient.disconnect).toHaveBeenCalled();
     });

redisinsight/api/src/modules/certificate/repositories/local.ca-certificate.repository.spec.ts

@@ -57,7 +57,7 @@ describe('LocalCaCertificateRepository', () => {
     repository.save.mockResolvedValue(mockCaCertificateEntity);
     repository.create.mockReturnValue(mockCaCertificate); // not entity since it happens before encryption
 
-    when(encryptionService.decrypt).calledWith(mockCaCertificateCertificateEncrypted, jasmine.anything())
+    when(encryptionService.decrypt).calledWith(mockCaCertificateCertificateEncrypted, expect.anything())
       .mockResolvedValue(mockCaCertificateCertificatePlain);
     when(encryptionService.encrypt).calledWith(mockCaCertificateCertificatePlain)
       .mockResolvedValue({

redisinsight/api/src/modules/certificate/repositories/local.client-certificate.repository.spec.ts

@@ -65,9 +65,9 @@ describe('LocalClientCertificateRepository', () => {
     repository.create.mockReturnValue(mockClientCertificate); // not an entity since create happens before encryption
 
     when(encryptionService.decrypt)
-      .calledWith(mockClientCertificateCertificateEncrypted, jasmine.anything())
+      .calledWith(mockClientCertificateCertificateEncrypted, expect.anything())
       .mockResolvedValue(mockClientCertificateCertificatePlain)
-      .calledWith(mockClientCertificateKeyEncrypted, jasmine.anything())
+      .calledWith(mockClientCertificateKeyEncrypted, expect.anything())
       .mockResolvedValue(mockClientCertificateKeyPlain);
     when(encryptionService.encrypt)
       .calledWith(mockClientCertificateCertificatePlain)