ci(core): Reduce memory usage in tests (part-2) (no-changelog) (#7671)

This also gets rid of `Db.collection`, which was another source of
circular dependencies.

packages/cli/test/integration/shared/utils/communityNodes.ts

@@ -3,7 +3,8 @@ import { InstalledPackages } from '@db/entities/InstalledPackages';
 
 import { randomName } from '../random';
 import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '../constants';
-import { InstalledNodesRepository, InstalledPackagesRepository } from '@/databases/repositories';
+import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
+import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
 import Container from 'typedi';
 
 export const mockPackageName = () => NODE_PACKAGE_PREFIX + randomName();

packages/cli/test/integration/shared/utils/index.ts

@@ -10,15 +10,14 @@ import type request from 'supertest';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config';
-import * as Db from '@/Db';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { AUTH_COOKIE_NAME } from '@/constants';
 
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from './mocking';
+import { SettingsRepository } from '@db/repositories/settings.repository';
 import { mockNodeTypesData } from '../../../unit/Helpers';
+import { mockInstance } from '../../../shared/mocking';
 
-export { mockInstance } from './mocking';
 export { setupTestServer } from './testServer';
 
 // ----------------------------------
@@ -108,7 +107,7 @@ export function getAuthToken(response: request.Response, authCookieName = AUTH_C
 // ----------------------------------
 
 export async function isInstanceOwnerSetUp() {
-	const { value } = await Db.collections.Settings.findOneByOrFail({
+	const { value } = await Container.get(SettingsRepository).findOneByOrFail({
 		key: 'userManagement.isInstanceOwnerSetUp',
 	});
 
@@ -118,7 +117,7 @@ export async function isInstanceOwnerSetUp() {
 export const setInstanceOwnerSetUp = async (value: boolean) => {
 	config.set('userManagement.isInstanceOwnerSetUp', value);
 
-	await Db.collections.Settings.update(
+	await Container.get(SettingsRepository).update(
 		{ key: 'userManagement.isInstanceOwnerSetUp' },
 		{ value: JSON.stringify(value) },
 	);

packages/cli/test/integration/shared/utils/mocking.ts

@@ -1,12 +0,0 @@
-import { Container } from 'typedi';
-import { mock } from 'jest-mock-extended';
-import type { DeepPartial } from 'ts-essentials';
-
-export const mockInstance = <T>(
-	ctor: new (...args: unknown[]) => T,
-	data: DeepPartial<T> | undefined = undefined,
-) => {
-	const instance = mock<T>(data);
-	Container.set(ctor, instance);
-	return instance;
-};

packages/cli/test/integration/shared/utils/testServer.ts

@@ -14,18 +14,12 @@ import { rawBodyReader, bodyParser, setupAuthMiddlewares } from '@/middlewares';
 import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
 import { License } from '@/License';
-
-import {
-	SettingsRepository,
-	SharedCredentialsRepository,
-	SharedWorkflowRepository,
-} from '@/databases/repositories';
 import { Logger } from '@/Logger';
 
+import { mockInstance } from '../../../shared/mocking';
 import * as testDb from '../../shared/testDb';
 import { AUTHLESS_ENDPOINTS, PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
 import type { SetupProps, TestServer } from '../types';
-import { mockInstance } from './mocking';
 
 /**
  * Plugin to prefix a path segment into a request URL pathname.
@@ -217,6 +211,7 @@ export const setupTestServer = ({
 
 					case 'owner':
 						const { UserService } = await import('@/services/user.service');
+						const { SettingsRepository } = await import('@db/repositories/settings.repository');
 						const { OwnerController } = await import('@/controllers/owner.controller');
 						registerController(
 							app,
@@ -232,6 +227,12 @@ export const setupTestServer = ({
 						break;
 
 					case 'users':
+						const { SharedCredentialsRepository } = await import(
+							'@db/repositories/sharedCredentials.repository'
+						);
+						const { SharedWorkflowRepository } = await import(
+							'@db/repositories/sharedWorkflow.repository'
+						);
 						const { ActiveWorkflowRunner } = await import('@/ActiveWorkflowRunner');
 						const { ExternalHooks } = await import('@/ExternalHooks');
 						const { JwtService } = await import('@/services/jwt.service');