test(core): Move unit tests closer to testable components (no-changelog) (#10287)

packages/cli/.eslintrc.js

@@ -40,13 +40,13 @@ module.exports = {
 
 	overrides: [
 		{
-			files: ['./src/databases/**/*.ts', './test/**/*.ts'],
+			files: ['./src/databases/**/*.ts', './test/**/*.ts', './src/**/__tests__/**/*.ts'],
 			rules: {
 				'n8n-local-rules/misplaced-n8n-typeorm-import': 'off',
 			},
 		},
 		{
-			files: ['./test/**/*.ts'],
+			files: ['./test/**/*.ts', './src/**/__tests__/**/*.ts'],
 			rules: {
 				'n8n-local-rules/no-type-unsafe-event-emitter': 'off',
 			},

packages/cli/src/ActiveWebhooks.ts

@@ -72,11 +72,9 @@ export class ActiveWebhooks implements IWebhookManager {
 			const pathElements = path.split('/').slice(1);
 
 			// extracting params from path
-			// @ts-ignore
 			webhook.webhookPath.split('/').forEach((ele, index) => {
 				if (ele.startsWith(':')) {
 					// write params to req.params
-					// @ts-ignore
 					request.params[ele.slice(1)] = pathElements[index];
 				}
 			});

packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts

@@ -6,13 +6,13 @@ import { License } from '@/License';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
 import { InternalHooks } from '@/InternalHooks';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import {
 	DummyProvider,
 	ErrorProvider,
 	FailedProvider,
 	MockProviders,
-} from '../../shared/ExternalSecrets/utils';
+} from '@test/ExternalSecrets/utils';
 import { mock } from 'jest-mock-extended';
 
 describe('External Secrets Manager', () => {

packages/cli/src/Ldap/__tests__/helpers.test.ts

@@ -1,5 +1,5 @@
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import * as helpers from '@/Ldap/helpers.ee';
 import { AuthIdentity } from '@/databases/entities/AuthIdentity';
 import { User } from '@/databases/entities/User';

packages/cli/src/WorkflowExecuteAdditionalData.ts

@@ -717,7 +717,6 @@ export async function getRunData(
 	const runData: IWorkflowExecutionDataProcess = {
 		executionMode: mode,
 		executionData: runExecutionData,
-		// @ts-ignore
 		workflowData,
 	};
 

packages/cli/src/__tests__/CredentialTypes.test.ts

@@ -1,7 +1,7 @@
 import { CredentialTypes } from '@/CredentialTypes';
 import { Container } from 'typedi';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('CredentialTypes', () => {
 	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {

packages/cli/src/__tests__/CredentialsHelper.test.ts

@@ -14,7 +14,7 @@ import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('CredentialsHelper', () => {
 	mockInstance(CredentialsRepository);

packages/cli/src/__tests__/License.test.ts

@@ -5,7 +5,7 @@ import config from '@/config';
 import { License } from '@/License';
 import { Logger } from '@/Logger';
 import { N8N_VERSION } from '@/constants';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 jest.mock('@n8n_io/license-sdk');

packages/cli/src/__tests__/WorkflowExecuteAdditionalData.test.ts

@@ -1,5 +1,5 @@
 import { VariablesService } from '@/environments/variables/variables.service.ee';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { getBase } from '@/WorkflowExecuteAdditionalData';
 import Container from 'typedi';

packages/cli/src/__tests__/WorkflowRunner.test.ts

@@ -4,11 +4,11 @@ import type { User } from '@db/entities/User';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import config from '@/config';
 
-import * as testDb from '../integration/shared/testDb';
+import * as testDb from '@test-integration/testDb';
-import { setupTestServer } from '../integration/shared/utils';
+import { setupTestServer } from '@test-integration/utils';
-import { createUser } from '../integration/shared/db/users';
+import { createUser } from '@test-integration/db/users';
-import { createWorkflow } from '../integration/shared/db/workflows';
+import { createWorkflow } from '@test-integration/db/workflows';
-import { createExecution } from '../integration/shared/db/executions';
+import { createExecution } from '@test-integration/db/executions';
 import { mockInstance } from '@test/mocking';
 import { Telemetry } from '@/telemetry';
 

packages/cli/src/commands/db/__tests__/revert.test.ts

@@ -1,5 +1,5 @@
 import { main } from '@/commands/db/revert';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { Logger } from '@/Logger';
 import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types';
 import type { Migration, MigrationExecutor } from '@n8n/typeorm';

packages/cli/src/controllers/__tests__/me.controller.test.ts

@@ -13,8 +13,8 @@ import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { badPasswords } from '../shared/testData';
+import { badPasswords } from '@test/testData';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 const browserId = 'test-browser-id';
 

packages/cli/src/controllers/__tests__/owner.controller.test.ts

@@ -16,8 +16,8 @@ import type { OwnerRequest } from '@/requests';
 import type { UserService } from '@/services/user.service';
 import { PasswordUtility } from '@/services/password.utility';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
-import { badPasswords } from '../shared/testData';
+import { badPasswords } from '@test/testData';
 
 describe('OwnerController', () => {
 	const configGetSpy = jest.spyOn(config, 'getEnv');

packages/cli/src/controllers/__tests__/userSettings.controller.test.ts

@@ -60,7 +60,7 @@ describe('UserSettingsController', () => {
 				[],
 			],
 			[
-				'updates user settings, reseting to waiting state',
+				'updates user settings, resetting to waiting state',
 				{
 					waitingForResponse: true,
 					ignoredCount: 0,
@@ -137,7 +137,7 @@ describe('UserSettingsController', () => {
 				'is waitingForResponse but missing ignoredCount',
 				{ lastShownAt: 123, waitingForResponse: true },
 			],
-		])('thows error when request payload is %s', async (_, payload) => {
+		])('throws error when request payload is %s', async (_, payload) => {
 			const req = mock<NpsSurveyRequest.NpsSurveyUpdate>();
 			req.user.id = '1';
 			req.body = payload;

packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts

@@ -19,7 +19,7 @@ import { CredentialsHelper } from '@/CredentialsHelper';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('OAuth1CredentialController', () => {
 	mockInstance(Logger);

packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts

@@ -19,7 +19,7 @@ import { CredentialsHelper } from '@/CredentialsHelper';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('OAuth2CredentialController', () => {
 	mockInstance(Logger);

packages/cli/src/credentials/__tests__/credentials.service.test.ts

@@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended';
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { CredentialTypes } from '@/CredentialTypes';
-import { CredentialsService } from '../credentials.service';
+import { CredentialsService } from '@/credentials/credentials.service';
 
 describe('CredentialsService', () => {
 	const credType = mock<ICredentialType>({

packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts

@@ -8,8 +8,7 @@ import { mock } from 'jest-mock-extended';
 
 import { ExecutionEntity } from '@db/entities/ExecutionEntity';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
-import { mockEntityManager } from '../../shared/mocking';
+import { mockInstance, mockEntityManager } from '@test/mocking';
-import { mockInstance } from '../../shared/mocking';
 
 describe('ExecutionRepository', () => {
 	const entityManager = mockEntityManager(ExecutionEntity);

packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts

@@ -8,7 +8,7 @@ import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions/global-roles';
-import { mockEntityManager } from '../../shared/mocking';
+import { mockEntityManager } from '@test/mocking';
 
 describe('SharedCredentialsRepository', () => {
 	const entityManager = mockEntityManager(SharedCredentials);

packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts

@@ -5,7 +5,7 @@ import { mock, mockClear } from 'jest-mock-extended';
 import { StatisticsNames, WorkflowStatistics } from '@db/entities/WorkflowStatistics';
 import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
 
-import { mockEntityManager } from '../../shared/mocking';
+import { mockEntityManager } from '@test/mocking';
 
 describe('insertWorkflowStatistics', () => {
 	const entityManager = mockEntityManager(WorkflowStatistics);

packages/cli/src/environments/sourceControl/__tests__/sourceControlHelper.ee.test.ts

@@ -18,7 +18,7 @@ import {
 import { constants as fsConstants, accessSync } from 'fs';
 import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
 import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 const pushResult: SourceControlledFile[] = [
 	{

packages/cli/src/executionLifecycleHooks/__tests__/restoreBinaryDataId.test.ts

@@ -1,6 +1,6 @@
 import { restoreBinaryDataId } from '@/executionLifecycleHooks/restoreBinaryDataId';
 import { BinaryDataService } from 'n8n-core';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 import type { IRun } from 'n8n-workflow';
 import config from '@/config';
@@ -24,7 +24,7 @@ function toIRun(item?: object) {
 }
 
 function getDataId(run: IRun, kind: 'binary' | 'json') {
-	// @ts-ignore
+	// @ts-expect-error The type doesn't have the correct structure
 	return run.data.resultData.runData.myNode[0].data.main[0][0][kind].data.id;
 }
 

packages/cli/src/executionLifecycleHooks/__tests__/saveExecutionProgress.test.ts

@@ -1,5 +1,5 @@
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { Logger } from '@/Logger';
 import { saveExecutionProgress } from '@/executionLifecycleHooks/saveExecutionProgress';
 import * as fnModule from '@/executionLifecycleHooks/toSaveSettings';

packages/cli/src/executionLifecycleHooks/__tests__/toSaveSettings.test.ts

@@ -35,7 +35,7 @@ describe('failed production executions', () => {
 	});
 });
 
-describe('sucessful production executions', () => {
+describe('successful production executions', () => {
 	it('should favor workflow settings over defaults', () => {
 		config.set('executions.saveDataOnSuccess', 'none');
 

packages/cli/src/posthog/__tests__/PostHog.test.ts

@@ -2,7 +2,7 @@ import { PostHog } from 'posthog-node';
 import { InstanceSettings } from 'n8n-core';
 import { PostHogClient } from '@/posthog';
 import config from '@/config';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.mock('posthog-node');
 

packages/cli/src/push/__tests__/index.test.ts

@@ -9,7 +9,7 @@ import { WebSocketPush } from '@/push/websocket.push';
 import type { WebSocketPushRequest, SSEPushRequest } from '@/push/types';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.unmock('@/push');
 

packages/cli/src/push/__tests__/websocket.push.test.ts

@@ -6,7 +6,7 @@ import { WebSocketPush } from '@/push/websocket.push';
 import { Logger } from '@/Logger';
 import type { PushDataExecutionRecovered } from '@/Interfaces';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.useFakeTimers();
 

packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts

@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
 import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
 import { ExecutionMetadataService } from '@/services/executionMetadata.service';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('ExecutionMetadataService', () => {
 	const repository = mockInstance(ExecutionMetadataRepository);

packages/cli/src/services/__tests__/communityPackages.service.test.ts

@@ -20,13 +20,10 @@ import { InstalledPackagesRepository } from '@db/repositories/installedPackages.
 import { InstalledNodes } from '@db/entities/InstalledNodes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
-import {
+import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '@test-integration/constants';
-	COMMUNITY_NODE_VERSION,
+import { randomName } from '@test-integration/random';
-	COMMUNITY_PACKAGE_VERSION,
+import { mockPackageName, mockPackagePair } from '@test-integration/utils';
-} from '../../integration/shared/constants';
-import { randomName } from '../../integration/shared/random';
-import { mockPackageName, mockPackagePair } from '../../integration/shared/utils';
 import { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
 import { Logger } from '@/Logger';
 

packages/cli/src/services/__tests__/naming.service.test.ts

@@ -1,6 +1,6 @@
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { NamingService } from '@/services/naming.service';
 import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';

packages/cli/src/services/__tests__/orchestration.service.test.ts

@@ -17,7 +17,7 @@ import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager
 import { Logger } from '@/Logger';
 import { Push } from '@/push';
 import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { RedisClientService } from '@/services/redis/redis-client.service';
 
 const instanceSettings = Container.get(InstanceSettings);

packages/cli/src/services/__tests__/ownership.service.test.ts

@@ -3,14 +3,14 @@ import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.reposi
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { User } from '@db/entities/User';
 import type { SharedCredentials } from '@db/entities/SharedCredentials';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { mock } from 'jest-mock-extended';
 import { Project } from '@/databases/entities/Project';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import { ProjectRelation } from '@/databases/entities/ProjectRelation';
-import { mockCredential, mockProject } from '../shared/mockObjects';
+import { mockCredential, mockProject } from '@test/mockObjects';
 
 describe('OwnershipService', () => {
 	const userRepository = mockInstance(UserRepository);

packages/cli/src/services/__tests__/redis.service.test.ts

@@ -2,7 +2,7 @@ import Container from 'typedi';
 import { Logger } from '@/Logger';
 import config from '@/config';
 import { RedisService } from '@/services/redis.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.mock('ioredis', () => {
 	const Redis = require('ioredis-mock');
@@ -14,7 +14,7 @@ jest.mock('ioredis', () => {
 		};
 	}
 	// second mock for our code
-	return function (...args: any) {
+	return function (...args: unknown[]) {
 		return new Redis(args);
 	};
 });

packages/cli/src/services/__tests__/user.service.test.ts

@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
 import { User } from '@db/entities/User';
 import { UserService } from '@/services/user.service';
 import { UrlService } from '@/services/url.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { GlobalConfig } from '@n8n/config';
 

packages/cli/src/services/__tests__/webhook.service.test.ts

@@ -4,7 +4,7 @@ import { WebhookRepository } from '@db/repositories/webhook.repository';
 import { CacheService } from '@/services/cache/cache.service';
 import { WebhookService } from '@/services/webhook.service';
 import { WebhookEntity } from '@db/entities/WebhookEntity';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 const createWebhook = (method: string, path: string, webhookId?: string, pathSegments?: number) =>
 	Object.assign(new WebhookEntity(), {

packages/cli/src/services/__tests__/workflow-statistics.service.test.ts

@@ -17,7 +17,7 @@ import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistic
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { UserService } from '@/services/user.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import type { Project } from '@/databases/entities/Project';
 
 describe('WorkflowStatisticsService', () => {

packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts

@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type express from 'express';
 import { SamlService } from '@/sso/saml/saml.service.ee';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UrlService } from '@/services/url.service';
 import { Logger } from '@/Logger';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';

packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts

@@ -2,7 +2,7 @@ import { User } from '@/databases/entities/User';
 import { generateNanoId } from '@/databases/utils/generators';
 import * as helpers from '@/sso/saml/samlHelpers';
 import type { SamlUserAttributes } from '@/sso/saml/types/samlUserAttributes';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import type { AuthIdentity } from '@/databases/entities/AuthIdentity';
 import { AuthIdentityRepository } from '@/databases/repositories/authIdentity.repository';

packages/cli/src/telemetry/__tests__/telemetry.test.ts

@@ -1,11 +1,11 @@
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { Telemetry } from '@/telemetry';
 import config from '@/config';
-import { flushPromises } from './Helpers';
+import { flushPromises } from '@test/flushPromises';
 import { PostHogClient } from '@/posthog';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.unmock('@/telemetry');
 jest.mock('@/posthog');

packages/cli/src/workflows/workflowHistory/__tests__/workflowHistory.service.ee.test.ts

@@ -4,8 +4,8 @@ import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repo
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 import { WorkflowHistoryService } from '@/workflows/workflowHistory/workflowHistory.service.ee';
 import { Logger } from '@/Logger';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
-import { getWorkflow } from '../../integration/shared/workflow';
+import { getWorkflow } from '@test-integration/workflow';
 
 const workflowHistoryRepository = mockInstance(WorkflowHistoryRepository);
 const logger = mockInstance(Logger);

packages/cli/src/workflows/workflowHistory/__tests__/workflowHistoryHelper.ee.test.ts

@@ -1,7 +1,7 @@
 import { License } from '@/License';
 import config from '@/config';
 import { getWorkflowHistoryPruneTime } from '@/workflows/workflowHistory/workflowHistoryHelper.ee';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 let licensePruneTime = -1;
 

packages/cli/test/integration/PermissionChecker.test.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import type { INode } from 'n8n-workflow';
+import type { INode, INodeTypeData } from 'n8n-workflow';
 import { randomInt } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
@@ -14,7 +14,6 @@ import { mockInstance } from '../shared/mocking';
 import { randomCredentialPayload as randomCred } from '../integration/shared/random';
 import * as testDb from '../integration/shared/testDb';
 import type { SaveCredentialFunction } from '../integration/shared/types';
-import { mockNodeTypesData } from '../unit/Helpers';
 import { affixRoleToSaveCredential } from '../integration/shared/db/credentials';
 import { createOwner, createUser } from '../integration/shared/db/users';
 import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
@@ -25,6 +24,36 @@ import { ProjectRepository } from '@/databases/repositories/project.repository';
 
 const ownershipService = mockInstance(OwnershipService);
 
+function mockNodeTypesData(
+	nodeNames: string[],
+	options?: {
+		addTrigger?: boolean;
+	},
+) {
+	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
+		return (
+			(acc[`n8n-nodes-base.${nodeName}`] = {
+				sourcePath: '',
+				type: {
+					description: {
+						displayName: nodeName,
+						name: nodeName,
+						group: [],
+						description: '',
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+					},
+					trigger: options?.addTrigger ? async () => undefined : undefined,
+				},
+			}),
+			acc
+		);
+	}, {});
+}
+
 const createWorkflow = async (nodes: INode[], workflowOwner?: User): Promise<WorkflowEntity> => {
 	const workflowDetails = {
 		id: randomInt(1, 10).toString(),

packages/cli/test/integration/webhooks.test.ts

@@ -11,7 +11,7 @@ import { WaitingWebhooks } from '@/WaitingWebhooks';
 import { WaitingForms } from '@/WaitingForms';
 import type { IResponseCallbackData } from '@/Interfaces';
 
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
 import Container from 'typedi';
 

packages/cli/test/shared/flushPromises.ts

@@ -0,0 +1,6 @@
+/**
+ * Ensure all pending promises settle. The promise's `resolve` is placed in
+ * the macrotask queue and so called at the next iteration of the event loop
+ * after all promises in the microtask queue have settled first.
+ */
+export const flushPromises = async () => await new Promise(setImmediate);

packages/cli/test/shared/mockObjects.ts

@@ -8,7 +8,7 @@ import {
 	randomEmail,
 	randomName,
 	uniqueId,
-} from '../../integration/shared/random';
+} from '../integration/shared/random';
 
 export const mockCredential = (): CredentialsEntity =>
 	Object.assign(new CredentialsEntity(), randomCredentialPayload());

packages/cli/test/unit/Helpers.ts

@@ -1,38 +0,0 @@
-import type { INodeTypeData } from 'n8n-workflow';
-
-/**
- * Ensure all pending promises settle. The promise's `resolve` is placed in
- * the macrotask queue and so called at the next iteration of the event loop
- * after all promises in the microtask queue have settled first.
- */
-export const flushPromises = async () => await new Promise(setImmediate);
-
-export function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}