diff --git a/packages/cli/src/__tests__/active-workflow-manager.test.ts b/packages/cli/src/__tests__/active-workflow-manager.test.ts index 149029a515..55775f64b1 100644 --- a/packages/cli/src/__tests__/active-workflow-manager.test.ts +++ b/packages/cli/src/__tests__/active-workflow-manager.test.ts @@ -1,6 +1,5 @@ import { mockLogger } from '@n8n/backend-test-utils'; -import type { WorkflowEntity } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import type { WorkflowEntity, WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; import type { diff --git a/packages/cli/src/__tests__/command-registry.test.ts b/packages/cli/src/__tests__/command-registry.test.ts index 4cc17af422..5a130f0555 100644 --- a/packages/cli/src/__tests__/command-registry.test.ts +++ b/packages/cli/src/__tests__/command-registry.test.ts @@ -7,7 +7,7 @@ import { z } from 'zod'; import { CommandRegistry } from '../command-registry'; jest.mock('fast-glob'); -// eslint-disable-next-line import-x/no-default-export + import glob from 'fast-glob'; describe('CommandRegistry', () => { diff --git a/packages/cli/src/__tests__/controller.registry.test.ts b/packages/cli/src/__tests__/controller.registry.test.ts index 92a985b1a3..1d784c1ad6 100644 --- a/packages/cli/src/__tests__/controller.registry.test.ts +++ b/packages/cli/src/__tests__/controller.registry.test.ts @@ -6,9 +6,7 @@ jest.mock('@n8n/backend-common', () => { }); import type { GlobalConfig } from '@n8n/config'; -import { ControllerRegistryMetadata } from '@n8n/decorators'; -import { Param } from '@n8n/decorators'; -import { Get, Licensed, RestController } from '@n8n/decorators'; +import { ControllerRegistryMetadata, Param, Get, Licensed, RestController } from '@n8n/decorators'; import { Container } from '@n8n/di'; import express from 'express'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/__tests__/credentials-overwrites.test.ts b/packages/cli/src/__tests__/credentials-overwrites.test.ts index 493dbc49dc..ce59a741e8 100644 --- a/packages/cli/src/__tests__/credentials-overwrites.test.ts +++ b/packages/cli/src/__tests__/credentials-overwrites.test.ts @@ -100,7 +100,7 @@ describe('CredentialsOverwrites', () => { expect(firstCall).toEqual(secondCall); expect(credentialTypes.getByName).toHaveBeenCalledTimes(2); - // eslint-disable-next-line @typescript-eslint/dot-notation + expect(credentialsOverwrites['resolvedTypes']).toEqual(['parent', 'test']); }); diff --git a/packages/cli/src/__tests__/external-hooks.test.ts b/packages/cli/src/__tests__/external-hooks.test.ts index 542bc7cdba..f2d66d583a 100644 --- a/packages/cli/src/__tests__/external-hooks.test.ts +++ b/packages/cli/src/__tests__/external-hooks.test.ts @@ -1,8 +1,11 @@ import type { Logger } from '@n8n/backend-common'; import type { GlobalConfig } from '@n8n/config'; -import type { WorkflowRepository } from '@n8n/db'; -import type { CredentialsRepository, SettingsRepository } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { + WorkflowRepository, + CredentialsRepository, + SettingsRepository, + UserRepository, +} from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { ErrorReporter } from 'n8n-core'; import type { IWorkflowBase } from 'n8n-workflow'; @@ -72,7 +75,6 @@ describe('ExternalHooks', () => { await externalHooks.init(); - // eslint-disable-next-line @typescript-eslint/dot-notation expect(externalHooks['registered']['workflow.create']).toHaveLength(1); await externalHooks.run('workflow.create', [workflowData]); @@ -88,7 +90,6 @@ describe('ExternalHooks', () => { }); it('should execute registered hooks', async () => { - // eslint-disable-next-line @typescript-eslint/dot-notation externalHooks['registered']['workflow.create'] = [hookFn]; await externalHooks.run('workflow.create', [workflowData]); @@ -108,7 +109,7 @@ describe('ExternalHooks', () => { it('should report error if hook execution fails', async () => { const error = new Error('Hook failed'); hookFn.mockRejectedValueOnce(error); - // eslint-disable-next-line @typescript-eslint/dot-notation + externalHooks['registered']['workflow.create'] = [hookFn]; await expect(externalHooks.run('workflow.create', [workflowData])).rejects.toThrow(error); diff --git a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts index ec1de3e14b..d5e14b9263 100644 --- a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts +++ b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts @@ -292,9 +292,9 @@ describe('LoadNodesAndCredentials', () => { }, ] as unknown as INodeTypeDescription[]; // private field - // eslint-disable-next-line @typescript-eslint/dot-notation + instance['known'].nodes.testNode = { className: 'TestNode', sourcePath: '/path/to/testNode' }; - // eslint-disable-next-line @typescript-eslint/dot-notation + instance['known'].credentials['testCredential'] = { className: 'TestCredential', sourcePath: '/path/to/testCredential', @@ -340,7 +340,7 @@ describe('LoadNodesAndCredentials', () => { expect(instance.types.nodes).toHaveLength(2); // accesses private property - // eslint-disable-next-line @typescript-eslint/dot-notation + expect(instance['known'].credentials.testCredential.supportedNodes).toEqual([ 'testNode', 'testNodeTool', diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts index 76e6ae6926..dc7d06c57b 100644 --- a/packages/cli/src/__tests__/wait-tracker.test.ts +++ b/packages/cli/src/__tests__/wait-tracker.test.ts @@ -1,7 +1,5 @@ import { mockLogger } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { IExecutionResponse } from '@n8n/db'; -import type { ExecutionRepository } from '@n8n/db'; +import type { Project, IExecutionResponse, ExecutionRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; import type { IRun, IWorkflowBase } from 'n8n-workflow'; diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts index 384b78e741..cdc1f8b20c 100644 --- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts +++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts @@ -1,13 +1,12 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { WorkflowEntity } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { ExternalSecretsProxy } from 'n8n-core'; -import type { IWorkflowBase } from 'n8n-workflow'; import type { + IWorkflowBase, IExecuteWorkflowInfo, IWorkflowExecuteAdditionalData, ExecuteWorkflowOptions, diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts index b0004d799b..d01995455c 100644 --- a/packages/cli/src/__tests__/workflow-runner.test.ts +++ b/packages/cli/src/__tests__/workflow-runner.test.ts @@ -1,26 +1,24 @@ -import { testDb } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { User } from '@n8n/db'; -import type { ExecutionEntity } from '@n8n/db'; +import { testDb, createWorkflow, mockInstance } from '@n8n/backend-test-utils'; +import type { User, ExecutionEntity } from '@n8n/db'; import { Container, Service } from '@n8n/di'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; import { DirectedGraph, WorkflowExecute } from 'n8n-core'; import * as core from 'n8n-core'; -import type { - IExecuteData, - INode, - IRun, - ITaskData, - IWaitingForExecution, - IWaitingForExecutionSource, - IWorkflowBase, - IWorkflowExecutionDataProcess, - StartNodeData, - IWorkflowExecuteAdditionalData, +import { + type IExecuteData, + type INode, + type IRun, + type ITaskData, + type IWaitingForExecution, + type IWaitingForExecutionSource, + type IWorkflowBase, + type IWorkflowExecutionDataProcess, + type StartNodeData, + type IWorkflowExecuteAdditionalData, + Workflow, + ExecutionError, } from 'n8n-workflow'; -import { Workflow, type ExecutionError } from 'n8n-workflow'; import PCancelable from 'p-cancelable'; import { ActiveExecutions } from '@/active-executions'; diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index 844f700c85..6ce6903a83 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -467,7 +467,6 @@ export class ActiveWorkflowManager { this.logger.error( `Issue on initial workflow activation try of ${formatWorkflow(dbWorkflow)} (startup)`, { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment error, workflowName: dbWorkflow.name, workflowId: dbWorkflow.id, @@ -778,7 +777,6 @@ export class ActiveWorkflowManager { error.message as string }" | retry in ${Math.floor(lastTimeout / 1000)} seconds`, { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment error, workflowId, workflowName, diff --git a/packages/cli/src/auth/__tests__/auth.service.test.ts b/packages/cli/src/auth/__tests__/auth.service.test.ts index 5f98fbb6dc..8a2b9c93ab 100644 --- a/packages/cli/src/auth/__tests__/auth.service.test.ts +++ b/packages/cli/src/auth/__tests__/auth.service.test.ts @@ -1,9 +1,11 @@ import type { GlobalConfig } from '@n8n/config'; import { Time } from '@n8n/constants'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { InvalidAuthTokenRepository } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { + AuthenticatedRequest, + User, + InvalidAuthTokenRepository, + UserRepository, +} from '@n8n/db'; import type { NextFunction, Response } from 'express'; import { mock } from 'jest-mock-extended'; import jwt from 'jsonwebtoken'; diff --git a/packages/cli/src/commands/__tests__/community-node.test.ts b/packages/cli/src/commands/__tests__/community-node.test.ts index fedcec0b8c..6de4c264e1 100644 --- a/packages/cli/src/commands/__tests__/community-node.test.ts +++ b/packages/cli/src/commands/__tests__/community-node.test.ts @@ -1,6 +1,4 @@ -import { type InstalledNodes } from '@n8n/db'; -import { type CredentialsEntity } from '@n8n/db'; -import { type User } from '@n8n/db'; +import { type InstalledNodes, type CredentialsEntity, type User } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { CommunityNode } from '../community-node'; diff --git a/packages/cli/src/commands/__tests__/execute-batch.test.ts b/packages/cli/src/commands/__tests__/execute-batch.test.ts index 1bfa564392..50da9f6347 100644 --- a/packages/cli/src/commands/__tests__/execute-batch.test.ts +++ b/packages/cli/src/commands/__tests__/execute-batch.test.ts @@ -1,8 +1,7 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { User, WorkflowEntity } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; -import { DbConnection } from '@n8n/db'; +import { WorkflowRepository, DbConnection } from '@n8n/db'; import { Container } from '@n8n/di'; import type { SelectQueryBuilder } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/commands/__tests__/execute.test.ts b/packages/cli/src/commands/__tests__/execute.test.ts index 62f72c023b..1934cb8fde 100644 --- a/packages/cli/src/commands/__tests__/execute.test.ts +++ b/packages/cli/src/commands/__tests__/execute.test.ts @@ -1,8 +1,7 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { User, WorkflowEntity } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; -import { DbConnection } from '@n8n/db'; +import { WorkflowRepository, DbConnection } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import type { IRun } from 'n8n-workflow'; diff --git a/packages/cli/src/commands/__tests__/worker.test.ts b/packages/cli/src/commands/__tests__/worker.test.ts index 4aece1b360..e514f4e84a 100644 --- a/packages/cli/src/commands/__tests__/worker.test.ts +++ b/packages/cli/src/commands/__tests__/worker.test.ts @@ -1,13 +1,13 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { Container } from '@n8n/di'; -import { Worker } from '../worker'; - import { PubSubRegistry } from '@/scaling/pubsub/pubsub.registry'; import { Subscriber } from '@/scaling/pubsub/subscriber.service'; import { WorkerStatusService } from '@/scaling/worker-status.service.ee'; import { RedisClientService } from '@/services/redis-client.service'; +import { Worker } from '../worker'; + mockInstance(RedisClientService); mockInstance(PubSubRegistry); mockInstance(Subscriber); diff --git a/packages/cli/src/commands/db/__tests__/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts index 8b621385e0..82b6c667f6 100644 --- a/packages/cli/src/commands/db/__tests__/revert.test.ts +++ b/packages/cli/src/commands/db/__tests__/revert.test.ts @@ -1,8 +1,7 @@ import { Logger } from '@n8n/backend-common'; import { mockInstance } from '@n8n/backend-test-utils'; import type { IrreversibleMigration, ReversibleMigration } from '@n8n/db'; -import type { Migration, MigrationExecutor } from '@n8n/typeorm'; -import { type DataSource } from '@n8n/typeorm'; +import type { Migration, MigrationExecutor, DataSource } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; import { main } from '@/commands/db/revert'; diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts index b0c2be1aaf..55e1ed61a9 100644 --- a/packages/cli/src/commands/execute-batch.ts +++ b/packages/cli/src/commands/execute-batch.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-loop-func */ import type { User } from '@n8n/db'; import { WorkflowRepository } from '@n8n/db'; import { Command } from '@n8n/decorators'; diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts index 5f54d13381..8673f7c91c 100644 --- a/packages/cli/src/commands/start.ts +++ b/packages/cli/src/commands/start.ts @@ -34,7 +34,7 @@ import { WorkflowRunner } from '@/workflow-runner'; import { BaseCommand } from './base-command'; -// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires +// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const open = require('open'); const flagsSchema = z.object({ diff --git a/packages/cli/src/commands/ttwf/generate.ts b/packages/cli/src/commands/ttwf/generate.ts index d46cdb7b1c..179a9d375b 100644 --- a/packages/cli/src/commands/ttwf/generate.ts +++ b/packages/cli/src/commands/ttwf/generate.ts @@ -1,7 +1,6 @@ import { AiWorkflowBuilderService } from '@n8n/ai-workflow-builder'; -import { Container } from '@n8n/di'; import { Command } from '@n8n/decorators'; - +import { Container } from '@n8n/di'; import fs from 'fs'; import { jsonParse, UserError } from 'n8n-workflow'; import { z } from 'zod'; diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts index 861647fcb7..572a9c1036 100644 --- a/packages/cli/src/commands/worker.ts +++ b/packages/cli/src/commands/worker.ts @@ -13,9 +13,9 @@ import { PubSubRegistry } from '@/scaling/pubsub/pubsub.registry'; import { Subscriber } from '@/scaling/pubsub/subscriber.service'; import type { ScalingService } from '@/scaling/scaling.service'; import type { WorkerServerEndpointsConfig } from '@/scaling/worker-server'; +import { WorkerStatusService } from '@/scaling/worker-status.service.ee'; import { BaseCommand } from './base-command'; -import { WorkerStatusService } from '@/scaling/worker-status.service.ee'; const flagsSchema = z.object({ concurrency: z.number().int().default(10).describe('How many jobs can run in parallel.'), diff --git a/packages/cli/src/config/types.ts b/packages/cli/src/config/types.ts index 20e620a3b3..aae7da82f6 100644 --- a/packages/cli/src/config/types.ts +++ b/packages/cli/src/config/types.ts @@ -50,7 +50,7 @@ type NumericPath = CollectPathsByType; type BooleanPath = CollectPathsByType; -type StringLiteralArrayPath = CollectPathsByType>; +type StringLiteralArrayPath = CollectPathsByType; type StringPath = CollectPathsByType; diff --git a/packages/cli/src/controller.registry.ts b/packages/cli/src/controller.registry.ts index 9a53c6b732..04320fb85c 100644 --- a/packages/cli/src/controller.registry.ts +++ b/packages/cli/src/controller.registry.ts @@ -57,7 +57,7 @@ export class ControllerRegistry { controller, handlerName, ) as unknown[]; - // eslint-disable-next-line @typescript-eslint/no-loop-func + const handler = async (req: Request, res: Response) => { const args: unknown[] = [req, res]; for (let index = 0; index < route.args.length; index++) { @@ -83,7 +83,7 @@ export class ControllerRegistry { ...(inProduction && route.rateLimit ? [this.createRateLimitMiddleware(route.rateLimit)] : []), - // eslint-disable-next-line @typescript-eslint/unbound-method + ...(route.skipAuth ? [] : ([ diff --git a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts index 92b3af63c5..e7e457a0f0 100644 --- a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts @@ -1,7 +1,5 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { ApiKey } from '@n8n/db'; +import type { AuthenticatedRequest, User, ApiKey } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/controllers/__tests__/auth.controller.test.ts b/packages/cli/src/controllers/__tests__/auth.controller.test.ts index 27380d6361..18a2ecb696 100644 --- a/packages/cli/src/controllers/__tests__/auth.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/auth.controller.test.ts @@ -1,8 +1,7 @@ import type { LoginRequestDto } from '@n8n/api-types'; import { Logger } from '@n8n/backend-common'; import { mockInstance } from '@n8n/backend-test-utils'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { AuthenticatedRequest, User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Response } from 'express'; diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts index 3a30aafd6e..47e05b1461 100644 --- a/packages/cli/src/controllers/__tests__/me.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts @@ -1,10 +1,7 @@ import { UserUpdateRequestDto } from '@n8n/api-types'; import { mockInstance } from '@n8n/backend-test-utils'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { PublicUser } from '@n8n/db'; -import { InvalidAuthTokenRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import type { AuthenticatedRequest, User, PublicUser } from '@n8n/db'; +import { InvalidAuthTokenRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Response } from 'express'; import { mock, anyObject } from 'jest-mock-extended'; diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts index 256b9f1e23..0f8b982fe0 100644 --- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts @@ -1,9 +1,12 @@ import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types'; import type { Logger } from '@n8n/backend-common'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { PublicUser, SettingsRepository } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { + AuthenticatedRequest, + User, + PublicUser, + SettingsRepository, + UserRepository, +} from '@n8n/db'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/controllers/__tests__/users.controller.test.ts b/packages/cli/src/controllers/__tests__/users.controller.test.ts index e26d587a4c..65c16b7b80 100644 --- a/packages/cli/src/controllers/__tests__/users.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/users.controller.test.ts @@ -1,6 +1,4 @@ -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { AuthenticatedRequest, User, UserRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts index f0e728a299..28750cfcc5 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts @@ -1,8 +1,7 @@ import { Logger } from '@n8n/backend-common'; import { mockInstance } from '@n8n/backend-test-utils'; import { Time } from '@n8n/constants'; -import type { CredentialsEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { CredentialsEntity, User } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import Csrf from 'csrf'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts index 73fda50925..b9ba4c9bec 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts @@ -1,8 +1,7 @@ import { Logger } from '@n8n/backend-common'; import { mockInstance } from '@n8n/backend-test-utils'; import { Time } from '@n8n/constants'; -import type { CredentialsEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { CredentialsEntity, User } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import Csrf from 'csrf'; diff --git a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts index c67ec98854..8a4c99876d 100644 --- a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts +++ b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts @@ -1,5 +1,4 @@ -import type { AuthenticatedRequest } from '@n8n/db'; -import type { SharedCredentialsRepository } from '@n8n/db'; +import type { AuthenticatedRequest, SharedCredentialsRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { createRawProjectData } from '@/__tests__/project.test-data'; @@ -29,7 +28,7 @@ describe('CredentialsController', () => { ); let req: AuthenticatedRequest; - let res = mock(); + const res = mock(); beforeAll(() => { req = { user: { id: '123' } } as AuthenticatedRequest; }); diff --git a/packages/cli/src/credentials/__tests__/credentials.service.test.ts b/packages/cli/src/credentials/__tests__/credentials.service.test.ts index 637a201b0b..e5148f3be4 100644 --- a/packages/cli/src/credentials/__tests__/credentials.service.test.ts +++ b/packages/cli/src/credentials/__tests__/credentials.service.test.ts @@ -1,5 +1,4 @@ -import type { CredentialsEntity } from '@n8n/db'; -import type { CredentialsRepository } from '@n8n/db'; +import type { CredentialsEntity, CredentialsRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { CREDENTIAL_ERRORS, CredentialDataError, Credentials, type ErrorReporter } from 'n8n-core'; import { CREDENTIAL_EMPTY_VALUE, type ICredentialType } from 'n8n-workflow'; diff --git a/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts index 332d2d9476..26e288a263 100644 --- a/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts @@ -1,5 +1,4 @@ -import { CredentialsEntity } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; +import { CredentialsEntity, CredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts index 9fe2028aa5..e2fa94acfb 100644 --- a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts @@ -2,8 +2,7 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { SqliteConfig } from '@n8n/config/src/configs/database.config'; import type { IExecutionResponse } from '@n8n/db'; -import { ExecutionEntity } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; +import { ExecutionEntity, ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { SelectQueryBuilder } from '@n8n/typeorm'; import { Not, LessThanOrEqual } from '@n8n/typeorm'; diff --git a/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts index e3c0457b23..4747402498 100644 --- a/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts @@ -1,9 +1,5 @@ -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { Folder } from '@n8n/db'; +import { getPersonalProject, createWorkflow, testDb } from '@n8n/backend-test-utils'; +import type { Project, User, Folder } from '@n8n/db'; import { FolderRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; diff --git a/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts b/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts index 4e1f66ad1d..b84f2e533b 100644 --- a/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts @@ -1,7 +1,5 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { StatisticsNames, WorkflowStatistics } from '@n8n/db'; -import { WorkflowStatisticsRepository } from '@n8n/db'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; +import { StatisticsNames, WorkflowStatistics, WorkflowStatisticsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { type InsertResult, QueryFailedError } from '@n8n/typeorm'; import { mock, mockClear } from 'jest-mock-extended'; diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts index 4ad3ae3b0f..2cec34f872 100644 --- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts @@ -1,13 +1,15 @@ import type { SourceControlledFile } from '@n8n/api-types'; import { User } from '@n8n/db'; -import type { SharedCredentials } from '@n8n/db'; -import type { SharedWorkflow } from '@n8n/db'; -import type { FolderRepository } from '@n8n/db'; -import type { TagRepository } from '@n8n/db'; -import type { WorkflowTagMappingRepository } from '@n8n/db'; -import type { SharedCredentialsRepository } from '@n8n/db'; -import type { SharedWorkflowRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import type { + SharedCredentials, + SharedWorkflow, + FolderRepository, + TagRepository, + WorkflowTagMappingRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { mock, captor } from 'jest-mock-extended'; import { Cipher, type InstanceSettings } from 'n8n-core'; diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts index 101ba718ba..246cd45647 100644 --- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts @@ -1,6 +1,11 @@ -import { Project, type ProjectRepository, User, WorkflowEntity } from '@n8n/db'; -import type { FolderRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import { + type FolderRepository, + type WorkflowRepository, + Project, + type ProjectRepository, + User, + WorkflowEntity, +} from '@n8n/db'; import * as fastGlob from 'fast-glob'; import { mock } from 'jest-mock-extended'; import { type InstanceSettings } from 'n8n-core'; diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts index e28ce455b7..35b1f353a3 100644 --- a/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts @@ -1,10 +1,12 @@ import type { SourceControlledFile } from '@n8n/api-types'; -import type { Variables } from '@n8n/db'; -import type { FolderWithWorkflowAndSubFolderCount } from '@n8n/db'; -import type { TagEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { FolderRepository } from '@n8n/db'; -import type { TagRepository } from '@n8n/db'; +import type { + Variables, + FolderWithWorkflowAndSubFolderCount, + TagEntity, + User, + FolderRepository, + TagRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { InstanceSettings } from 'n8n-core'; diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts index 73f62d3f46..26aaf74cab 100644 --- a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts +++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts @@ -1,16 +1,16 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { TestRun } from '@n8n/db'; -import type { TestCaseExecutionRepository } from '@n8n/db'; -import type { TestRunRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import { mockLogger, mockInstance } from '@n8n/backend-test-utils'; +import type { + TestRun, + TestCaseExecutionRepository, + TestRunRepository, + WorkflowRepository, +} from '@n8n/db'; import { readFileSync } from 'fs'; import type { Mock } from 'jest-mock'; import { mock } from 'jest-mock-extended'; import type { ErrorReporter } from 'n8n-core'; import { EVALUATION_NODE_TYPE, EVALUATION_TRIGGER_NODE_TYPE } from 'n8n-workflow'; -import type { IWorkflowBase } from 'n8n-workflow'; -import type { IRun, ExecutionError } from 'n8n-workflow'; +import type { IWorkflowBase, IRun, ExecutionError } from 'n8n-workflow'; import path from 'path'; import type { ActiveExecutions } from '@/active-executions'; diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts index 51b52ddb70..078e463b72 100644 --- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts +++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts @@ -1,23 +1,31 @@ +import type { NodeTypes } from '@/node-types'; import { mockInstance } from '@n8n/backend-test-utils'; import type { GlobalConfig } from '@n8n/config'; -import type { CredentialsEntity } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; -import type { IWorkflowDb } from '@n8n/db'; -import type { CredentialsRepository } from '@n8n/db'; -import type { ProjectRelationRepository } from '@n8n/db'; -import type { SharedWorkflowRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import type { + CredentialsEntity, + WorkflowEntity, + IWorkflowDb, + CredentialsRepository, + ProjectRelationRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { type BinaryDataConfig, InstanceSettings } from 'n8n-core'; -import type { INode, INodesGraphResult } from 'n8n-workflow'; -import { NodeApiError, TelemetryHelpers, type IRun, type IWorkflowBase } from 'n8n-workflow'; +import { + type INode, + type INodesGraphResult, + NodeApiError, + TelemetryHelpers, + type IRun, + type IWorkflowBase, +} from 'n8n-workflow'; import { N8N_VERSION } from '@/constants'; import { EventService } from '@/events/event.service'; import type { RelayEventMap } from '@/events/maps/relay.event-map'; import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay'; import type { License } from '@/license'; -import type { NodeTypes } from '@/node-types'; import type { Telemetry } from '@/telemetry'; const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve)); diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts index 62d69d7bb8..649b86e6aa 100644 --- a/packages/cli/src/events/relays/telemetry.event-relay.ts +++ b/packages/cli/src/events/relays/telemetry.event-relay.ts @@ -127,7 +127,7 @@ export class TelemetryEventRelay extends EventRelay { this.telemetry.track('Project settings updated', { user_id: userId, role, - // eslint-disable-next-line @typescript-eslint/no-shadow + members: members.map(({ userId: user_id, role }) => ({ user_id, role })), project_id: projectId, }); diff --git a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts index 6865e2a41b..1a5f68b04f 100644 --- a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts +++ b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts @@ -45,7 +45,7 @@ class ModulesHooksRegistry { runData, newStaticData, }; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/return-await + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return await instance[methodName].call(instance, context); }); break; @@ -58,7 +58,7 @@ class ModulesHooksRegistry { nodeName, taskData, }; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/return-await + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return await instance[methodName].call(instance, context); }); break; @@ -72,7 +72,7 @@ class ModulesHooksRegistry { taskData, executionData, }; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/return-await + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return await instance[methodName].call(instance, context); }); break; @@ -85,7 +85,7 @@ class ModulesHooksRegistry { workflowInstance, executionData, }; - // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/return-await + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return await instance[methodName].call(instance, context); }); break; diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts index 3c51246f50..0ec4d6b575 100644 --- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts +++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts @@ -1,6 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { stringify } from 'flatted'; diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts index 8a67f579fd..152660d6ef 100644 --- a/packages/cli/src/executions/__tests__/execution.service.test.ts +++ b/packages/cli/src/executions/__tests__/execution.service.test.ts @@ -1,6 +1,5 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import type { IExecutionResponse } from '@n8n/db'; -import type { ExecutionRepository } from '@n8n/db'; +import type { IExecutionResponse, ExecutionRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { WorkflowOperationError } from 'n8n-workflow'; diff --git a/packages/cli/src/executions/pre-execution-checks/__tests__/credentials-permission-checker.test.ts b/packages/cli/src/executions/pre-execution-checks/__tests__/credentials-permission-checker.test.ts index b91ef2acb8..7dc1685cb5 100644 --- a/packages/cli/src/executions/pre-execution-checks/__tests__/credentials-permission-checker.test.ts +++ b/packages/cli/src/executions/pre-execution-checks/__tests__/credentials-permission-checker.test.ts @@ -1,6 +1,4 @@ -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { SharedCredentialsRepository } from '@n8n/db'; +import type { Project, User, SharedCredentialsRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { INode } from 'n8n-workflow'; diff --git a/packages/cli/src/executions/pre-execution-checks/__tests__/subworkflow-policy-checker.test.ts b/packages/cli/src/executions/pre-execution-checks/__tests__/subworkflow-policy-checker.test.ts index fb2a65d40a..45db772132 100644 --- a/packages/cli/src/executions/pre-execution-checks/__tests__/subworkflow-policy-checker.test.ts +++ b/packages/cli/src/executions/pre-execution-checks/__tests__/subworkflow-policy-checker.test.ts @@ -1,8 +1,6 @@ import { mockInstance } from '@n8n/backend-test-utils'; import type { GlobalConfig } from '@n8n/config'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; +import type { Project, User, WorkflowEntity } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { INode, Workflow } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts index c0feabac2d..8688c32fb0 100644 --- a/packages/cli/src/external-hooks.ts +++ b/packages/cli/src/external-hooks.ts @@ -122,7 +122,6 @@ export class ExternalHooks { for (let hookFilePath of externalHookFiles) { hookFilePath = hookFilePath.trim(); try { - // eslint-disable-next-line @typescript-eslint/no-var-requires const hookFile = require(hookFilePath) as IExternalHooksFileData; this.loadHooks(hookFile); } catch (e) { @@ -162,7 +161,7 @@ export class ExternalHooks { await hookFunction.apply(context, hookParameters); } catch (cause) { this.logger.error(`There was a problem running hook "${hookName}"`); - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + const error = new UnexpectedError(`External hook "${hookName}" failed`, { cause }); this.errorReporter.error(error, { level: 'fatal' }); diff --git a/packages/cli/src/ldap.ee/__tests__/helpers.test.ts b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts index a9b0e1b42b..8667f0673e 100644 --- a/packages/cli/src/ldap.ee/__tests__/helpers.test.ts +++ b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts @@ -1,8 +1,5 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import { generateNanoId } from '@n8n/db'; -import { AuthIdentity } from '@n8n/db'; -import { User } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { generateNanoId, AuthIdentity, User, UserRepository } from '@n8n/db'; import * as helpers from '@/ldap.ee/helpers.ee'; diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts index 59426bb424..38678bdb6d 100644 --- a/packages/cli/src/load-nodes-and-credentials.ts +++ b/packages/cli/src/load-nodes-and-credentials.ts @@ -516,7 +516,7 @@ export class LoadNodesAndCredentials { async setupHotReload() { const { default: debounce } = await import('lodash/debounce'); - // eslint-disable-next-line import-x/no-extraneous-dependencies + const { watch } = await import('chokidar'); const { Push } = await import('@/push'); diff --git a/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts index 17db323a77..2c903fae7f 100644 --- a/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts +++ b/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts @@ -1,5 +1,4 @@ -import type { LicenseMetricsRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import type { LicenseMetricsRepository, WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { LicenseMetricsService } from '@/metrics/license-metrics.service'; diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts index 943166f681..061cacd2fa 100644 --- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts +++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts @@ -5,12 +5,12 @@ import type express from 'express'; import promBundle from 'express-prom-bundle'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; +import { EventMessageTypeNames } from 'n8n-workflow'; import promClient from 'prom-client'; import config from '@/config'; import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import type { EventService } from '@/events/event.service'; -import { EventMessageTypeNames } from 'n8n-workflow'; import { PrometheusMetricsService } from '../prometheus-metrics.service'; diff --git a/packages/cli/src/mfa/mfa.service.ts b/packages/cli/src/mfa/mfa.service.ts index db81b2b54a..3355442ad2 100644 --- a/packages/cli/src/mfa/mfa.service.ts +++ b/packages/cli/src/mfa/mfa.service.ts @@ -27,7 +27,6 @@ export class MfaService { try { await this.loadMFASettings(); } catch (error) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment this.logger.warn('Failed to load MFA settings', { error }); } } diff --git a/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts b/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts index f360c8c163..cc99b738d4 100644 --- a/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts +++ b/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts @@ -12,7 +12,7 @@ import { sortByQueryMiddleware } from '../sort-by'; describe('List query middleware', () => { let mockReq: ListQuery.Request; let mockRes: Response; - let nextFn: NextFunction = jest.fn(); + const nextFn: NextFunction = jest.fn(); let args: [ListQuery.Request, Response, NextFunction]; let sendErrorResponse: jest.SpyInstance; diff --git a/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts index 07f20bd13c..49c232e59a 100644 --- a/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts @@ -1,12 +1,11 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; -import type { IWorkflowDb } from '@n8n/db'; -import type { SharedWorkflowRepository } from '@n8n/db'; +import { + mockLogger, + createTeamProject, + createWorkflow, + testDb, + testModules, +} from '@n8n/backend-test-utils'; +import type { Project, WorkflowEntity, IWorkflowDb, SharedWorkflowRepository } from '@n8n/db'; import type { WorkflowExecuteAfterContext } from '@n8n/decorators'; import { Container } from '@n8n/di'; import { In } from '@n8n/typeorm'; diff --git a/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts index fd75a21f77..c2075a6984 100644 --- a/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts @@ -1,8 +1,10 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; +import { + mockLogger, + createTeamProject, + createWorkflow, + testDb, + testModules, +} from '@n8n/backend-test-utils'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { DateTime } from 'luxon'; diff --git a/packages/cli/src/modules/insights/__tests__/insights-pruning.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights-pruning.service.test.ts index cb5b92ea15..2bc4dc4eec 100644 --- a/packages/cli/src/modules/insights/__tests__/insights-pruning.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights-pruning.service.test.ts @@ -1,9 +1,11 @@ import type { LicenseState } from '@n8n/backend-common'; -import { mockLogger } from '@n8n/backend-test-utils'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; +import { + mockLogger, + createTeamProject, + createWorkflow, + testDb, + testModules, +} from '@n8n/backend-test-utils'; import { Time } from '@n8n/constants'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/modules/insights/__tests__/insights.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights.service.test.ts index dc8a220a3d..628a5ea588 100644 --- a/packages/cli/src/modules/insights/__tests__/insights.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights.service.test.ts @@ -1,13 +1,13 @@ import type { InsightsDateRange } from '@n8n/api-types'; import type { LicenseState } from '@n8n/backend-common'; -import { mockLogger } from '@n8n/backend-test-utils'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; -import type { IWorkflowDb } from '@n8n/db'; +import { + mockLogger, + createTeamProject, + createWorkflow, + testDb, + testModules, +} from '@n8n/backend-test-utils'; +import type { Project, WorkflowEntity, IWorkflowDb } from '@n8n/db'; import type { WorkflowExecuteAfterContext } from '@n8n/decorators'; import { Container } from '@n8n/di'; import type { MockProxy } from 'jest-mock-extended'; diff --git a/packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts b/packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts index 76282c0342..d4bc153ff4 100644 --- a/packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts +++ b/packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts @@ -1,7 +1,4 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; +import { createTeamProject, createWorkflow, testDb, testModules } from '@n8n/backend-test-utils'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; diff --git a/packages/cli/src/modules/insights/database/repositories/__tests__/insights-by-period.repository.test.ts b/packages/cli/src/modules/insights/database/repositories/__tests__/insights-by-period.repository.test.ts index aafb30377f..975383f453 100644 --- a/packages/cli/src/modules/insights/database/repositories/__tests__/insights-by-period.repository.test.ts +++ b/packages/cli/src/modules/insights/database/repositories/__tests__/insights-by-period.repository.test.ts @@ -1,7 +1,4 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; +import { createTeamProject, createWorkflow, testDb, testModules } from '@n8n/backend-test-utils'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts index 601cdfe78e..3fb3825847 100644 --- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts +++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts @@ -40,7 +40,7 @@ export async function getSharedWorkflowIds( export async function getSharedWorkflow( user: User, - workflowId?: string | undefined, + workflowId?: string, ): Promise { return await Container.get(SharedWorkflowRepository).findOne({ where: { diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts index b3eb10914d..743f809b56 100644 --- a/packages/cli/src/push/index.ts +++ b/packages/cli/src/push/index.ts @@ -94,7 +94,7 @@ export class Push extends TypedEmitter { setupPushHandler(restEndpoint: string, app: Application) { app.use( `/${restEndpoint}/push`, - // eslint-disable-next-line @typescript-eslint/unbound-method + this.authService.createAuthMiddleware(false), (req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => this.handleRequest(req, res), diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts index 710d60a615..d50653c761 100644 --- a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts +++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts @@ -1,12 +1,17 @@ import type { Logger } from '@n8n/backend-common'; -import type { IExecutionResponse } from '@n8n/db'; -import type { ExecutionRepository } from '@n8n/db'; +import type { IExecutionResponse, ExecutionRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { WorkflowExecute as ActualWorkflowExecute } from 'n8n-core'; import { ExternalSecretsProxy } from 'n8n-core'; import { mockInstance } from 'n8n-core/test/utils'; -import type { IPinData, ITaskData, IWorkflowExecuteAdditionalData } from 'n8n-workflow'; -import { Workflow, type IRunExecutionData, type WorkflowExecuteMode } from 'n8n-workflow'; +import { + type IPinData, + type ITaskData, + type IWorkflowExecuteAdditionalData, + Workflow, + type IRunExecutionData, + type WorkflowExecuteMode, +} from 'n8n-workflow'; import { CredentialsHelper } from '@/credentials-helper'; import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts index 0c4d1c03ba..dd8351f24d 100644 --- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts +++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts @@ -1,5 +1,4 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { mockLogger, mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; import * as BullModule from 'bull'; diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts index 027ae85cc5..3ddda10fb2 100644 --- a/packages/cli/src/server.ts +++ b/packages/cli/src/server.ts @@ -415,7 +415,7 @@ export class Server extends AbstractServer { }); // Route all UI urls to index.html to support history-api - const nonUIRoutes: Readonly = [ + const nonUIRoutes: readonly string[] = [ 'favicon.ico', 'assets', 'static', diff --git a/packages/cli/src/services/__tests__/active-workflows.service.test.ts b/packages/cli/src/services/__tests__/active-workflows.service.test.ts index c361176e17..f2984e6e28 100644 --- a/packages/cli/src/services/__tests__/active-workflows.service.test.ts +++ b/packages/cli/src/services/__tests__/active-workflows.service.test.ts @@ -1,7 +1,5 @@ import { WorkflowEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { SharedWorkflowRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; +import type { User, SharedWorkflowRepository, WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { ActivationErrorsService } from '@/activation-errors.service'; diff --git a/packages/cli/src/services/__tests__/community-packages.service.test.ts b/packages/cli/src/services/__tests__/community-packages.service.test.ts index 83dd21f980..cd1d2cda4d 100644 --- a/packages/cli/src/services/__tests__/community-packages.service.test.ts +++ b/packages/cli/src/services/__tests__/community-packages.service.test.ts @@ -1,12 +1,13 @@ import type { Logger } from '@n8n/backend-common'; -import { randomName } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { randomName, mockInstance } from '@n8n/backend-test-utils'; import type { GlobalConfig } from '@n8n/config'; import { LICENSE_FEATURES } from '@n8n/constants'; -import { InstalledNodes } from '@n8n/db'; -import { InstalledPackages } from '@n8n/db'; -import { InstalledNodesRepository } from '@n8n/db'; -import { InstalledPackagesRepository } from '@n8n/db'; +import { + InstalledNodes, + InstalledPackages, + InstalledNodesRepository, + InstalledPackagesRepository, +} from '@n8n/db'; import axios from 'axios'; import { exec } from 'child_process'; import { mkdir, readFile, writeFile, rm, access, constants } from 'fs/promises'; diff --git a/packages/cli/src/services/__tests__/credentials-finder.service.test.ts b/packages/cli/src/services/__tests__/credentials-finder.service.test.ts index e6f7aaca41..3356e42a54 100644 --- a/packages/cli/src/services/__tests__/credentials-finder.service.test.ts +++ b/packages/cli/src/services/__tests__/credentials-finder.service.test.ts @@ -1,6 +1,5 @@ import { SharedCredentials } from '@n8n/db'; -import type { CredentialsEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { CredentialsEntity, User } from '@n8n/db'; import { Container } from '@n8n/di'; import { In } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/services/__tests__/hooks.service.test.ts b/packages/cli/src/services/__tests__/hooks.service.test.ts index 65d0c359ba..f781ab32e4 100644 --- a/packages/cli/src/services/__tests__/hooks.service.test.ts +++ b/packages/cli/src/services/__tests__/hooks.service.test.ts @@ -1,8 +1,11 @@ -import type { AuthenticatedRequest } from '@n8n/db'; -import type { SettingsRepository, User } from '@n8n/db'; -import type { CredentialsRepository } from '@n8n/db'; -import type { WorkflowRepository } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { + AuthenticatedRequest, + SettingsRepository, + User, + CredentialsRepository, + WorkflowRepository, + UserRepository, +} from '@n8n/db'; import RudderStack from '@rudderstack/rudder-sdk-node'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/services/__tests__/last-active-at.service.test.ts b/packages/cli/src/services/__tests__/last-active-at.service.test.ts index b394243340..28179a276b 100644 --- a/packages/cli/src/services/__tests__/last-active-at.service.test.ts +++ b/packages/cli/src/services/__tests__/last-active-at.service.test.ts @@ -1,9 +1,7 @@ import { mockLogger } from '@n8n/backend-test-utils'; import type { GlobalConfig } from '@n8n/config'; import { Time } from '@n8n/constants'; -import type { AuthenticatedRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { UserRepository } from '@n8n/db'; +import type { AuthenticatedRequest, User, UserRepository } from '@n8n/db'; import type { NextFunction, Response } from 'express'; import { mock } from 'jest-mock-extended'; import { DateTime } from 'luxon'; diff --git a/packages/cli/src/services/__tests__/naming.service.test.ts b/packages/cli/src/services/__tests__/naming.service.test.ts index 2d93c541ae..c30b5514c7 100644 --- a/packages/cli/src/services/__tests__/naming.service.test.ts +++ b/packages/cli/src/services/__tests__/naming.service.test.ts @@ -1,8 +1,6 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import type { CredentialsEntity } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import type { CredentialsEntity, WorkflowEntity } from '@n8n/db'; +import { CredentialsRepository, WorkflowRepository } from '@n8n/db'; import { NamingService } from '@/services/naming.service'; diff --git a/packages/cli/src/services/__tests__/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts index f12e58ef32..2c307192b3 100644 --- a/packages/cli/src/services/__tests__/ownership.service.test.ts +++ b/packages/cli/src/services/__tests__/ownership.service.test.ts @@ -1,9 +1,15 @@ import { mockInstance } from '@n8n/backend-test-utils'; import type { SharedCredentials } from '@n8n/db'; -import { Project, SharedWorkflow, User, WorkflowEntity, ProjectRelation } from '@n8n/db'; -import { ProjectRelationRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { + Project, + SharedWorkflow, + User, + WorkflowEntity, + ProjectRelation, + ProjectRelationRepository, + SharedWorkflowRepository, + UserRepository, +} from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/services/__tests__/public-api-key.service.test.ts b/packages/cli/src/services/__tests__/public-api-key.service.test.ts index 9ffa5e7083..38978fce38 100644 --- a/packages/cli/src/services/__tests__/public-api-key.service.test.ts +++ b/packages/cli/src/services/__tests__/public-api-key.service.test.ts @@ -1,7 +1,6 @@ import { testDb } from '@n8n/backend-test-utils'; import type { AuthenticatedRequest } from '@n8n/db'; -import { ApiKeyRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { ApiKeyRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { getOwnerOnlyApiKeyScopes, type ApiKeyScope } from '@n8n/permissions'; import type { Response, NextFunction } from 'express'; diff --git a/packages/cli/src/services/__tests__/user.service.test.ts b/packages/cli/src/services/__tests__/user.service.test.ts index 1af757fcb9..651fcb1c14 100644 --- a/packages/cli/src/services/__tests__/user.service.test.ts +++ b/packages/cli/src/services/__tests__/user.service.test.ts @@ -1,7 +1,6 @@ import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import { User } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { User, UserRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts index 96f21f1cd9..faa957f44f 100644 --- a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts +++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts @@ -1,10 +1,6 @@ -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { getPersonalProject, createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import type { IWorkflowDb, Project, WorkflowEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { IWorkflowDb, Project, WorkflowEntity, User } from '@n8n/db'; import { WorkflowStatisticsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { diff --git a/packages/cli/src/sso.ee/oidc/oidc.service.ee.ts b/packages/cli/src/sso.ee/oidc/oidc.service.ee.ts index 9b9c7d46e6..57f3435687 100644 --- a/packages/cli/src/sso.ee/oidc/oidc.service.ee.ts +++ b/packages/cli/src/sso.ee/oidc/oidc.service.ee.ts @@ -171,7 +171,7 @@ export class OidcService { } catch (error) { this.logger.warn( 'Failed to load OIDC configuration from database, falling back to default configuration.', - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + { error }, ); } diff --git a/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts index 3f5c7e2e16..e9f9917e86 100644 --- a/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts +++ b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts @@ -1,9 +1,6 @@ import { mockInstance } from '@n8n/backend-test-utils'; import type { AuthIdentity } from '@n8n/db'; -import { generateNanoId } from '@n8n/db'; -import { User } from '@n8n/db'; -import { AuthIdentityRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { generateNanoId, User, AuthIdentityRepository, UserRepository } from '@n8n/db'; import * as helpers from '@/sso.ee/saml/saml-helpers'; import type { SamlUserAttributes } from '@/sso.ee/saml/types'; diff --git a/packages/cli/src/sso.ee/saml/saml.service.ee.ts b/packages/cli/src/sso.ee/saml/saml.service.ee.ts index 1f88646527..0cdacc2944 100644 --- a/packages/cli/src/sso.ee/saml/saml.service.ee.ts +++ b/packages/cli/src/sso.ee/saml/saml.service.ee.ts @@ -269,7 +269,7 @@ export class SamlService { // database. this.logger.error( 'SAML initialization detected an invalid metadata URL in database. Trying to initialize from metadata in database if available.', - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + { error }, ); } diff --git a/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts index 885d74a0c3..3b1ba7b10e 100644 --- a/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts +++ b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts @@ -719,7 +719,7 @@ describe('TaskBroker', () => { describe('task execution timeouts', () => { let taskBroker: TaskBroker; let config: TaskRunnersConfig; - let runnerLifecycleEvents = mock(); + const runnerLifecycleEvents = mock(); beforeAll(() => { jest.useFakeTimers(); diff --git a/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts index 40a7597d92..37f8064d10 100644 --- a/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts +++ b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts @@ -1,7 +1,6 @@ import type { DataRequestResponse, TaskDataRequestParams } from '@n8n/task-runner'; import { mock } from 'jest-mock-extended'; -import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow'; -import { type INode, type INodeExecutionData } from 'n8n-workflow'; +import type { IWorkflowExecuteAdditionalData, INode, INodeExecutionData } from 'n8n-workflow'; import { DataRequestResponseStripper } from '../data-request-response-stripper'; diff --git a/packages/cli/src/utils/__tests__/object-to-error.test.ts b/packages/cli/src/utils/__tests__/object-to-error.test.ts index c65676a426..26461b6a88 100644 --- a/packages/cli/src/utils/__tests__/object-to-error.test.ts +++ b/packages/cli/src/utils/__tests__/object-to-error.test.ts @@ -1,6 +1,6 @@ import { mock } from 'jest-mock-extended'; -import type { INode } from 'n8n-workflow'; -import { NodeOperationError, type Workflow } from 'n8n-workflow'; +import type { INode, Workflow } from 'n8n-workflow'; +import { NodeOperationError } from 'n8n-workflow'; import { objectToError } from '../object-to-error'; diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts index 4dd9715e68..13c97ce55d 100644 --- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts +++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts @@ -1,11 +1,12 @@ import { generateNanoId } from '@n8n/db'; import type * as express from 'express'; import { mock } from 'jest-mock-extended'; -import type { ITaskData, IWorkflowBase } from 'n8n-workflow'; -import { - type IWebhookData, - type IWorkflowExecuteAdditionalData, - type Workflow, +import type { + ITaskData, + IWorkflowBase, + IWebhookData, + IWorkflowExecuteAdditionalData, + Workflow, } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts index f5086a2049..41d8d2bc34 100644 --- a/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts +++ b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts @@ -1,5 +1,4 @@ -import type { IExecutionResponse } from '@n8n/db'; -import type { ExecutionRepository } from '@n8n/db'; +import type { IExecutionResponse, ExecutionRepository } from '@n8n/db'; import type express from 'express'; import { mock } from 'jest-mock-extended'; import { FORM_NODE_TYPE, WAITING_FORMS_EXECUTION_STATUS, type Workflow } from 'n8n-workflow'; diff --git a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts index ea5eb7049e..68b4c432b5 100644 --- a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts +++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts @@ -1,5 +1,4 @@ -import type { IExecutionResponse } from '@n8n/db'; -import type { ExecutionRepository } from '@n8n/db'; +import type { IExecutionResponse, ExecutionRepository } from '@n8n/db'; import type express from 'express'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts index 3493fa0a0b..f58739b124 100644 --- a/packages/cli/src/webhooks/live-webhooks.ts +++ b/packages/cli/src/webhooks/live-webhooks.ts @@ -13,14 +13,14 @@ import { WebhookService } from '@/webhooks/webhook.service'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service'; +import { authAllowlistedNodes } from './constants'; +import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; import type { IWebhookResponseCallbackData, IWebhookManager, WebhookAccessControlOptions, WebhookRequest, } from './webhook.types'; -import { authAllowlistedNodes } from './constants'; -import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; /** * Service for handling the execution of live webhooks, i.e. webhooks diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts index c387e063c0..1af0a130a1 100644 --- a/packages/cli/src/webhooks/test-webhooks.ts +++ b/packages/cli/src/webhooks/test-webhooks.ts @@ -25,6 +25,8 @@ import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; import type { WorkflowRequest } from '@/workflows/workflow.request'; +import { authAllowlistedNodes } from './constants'; +import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; import { WebhookService } from './webhook.service'; import type { IWebhookResponseCallbackData, @@ -32,8 +34,6 @@ import type { WebhookAccessControlOptions, WebhookRequest, } from './webhook.types'; -import { authAllowlistedNodes } from './constants'; -import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; /** * Service for handling the execution of webhooks of manual executions diff --git a/packages/cli/src/webhooks/waiting-forms.ts b/packages/cli/src/webhooks/waiting-forms.ts index ccc7bc4e98..8a97fa27bf 100644 --- a/packages/cli/src/webhooks/waiting-forms.ts +++ b/packages/cli/src/webhooks/waiting-forms.ts @@ -13,8 +13,8 @@ import { ConflictError } from '@/errors/response-errors/conflict.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { WaitingWebhooks } from '@/webhooks/waiting-webhooks'; -import type { IWebhookResponseCallbackData, WaitingWebhookRequest } from './webhook.types'; import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; +import type { IWebhookResponseCallbackData, WaitingWebhookRequest } from './webhook.types'; @Service() export class WaitingForms extends WaitingWebhooks { diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts index 3cc96fe4c2..894a17cabe 100644 --- a/packages/cli/src/webhooks/waiting-webhooks.ts +++ b/packages/cli/src/webhooks/waiting-webhooks.ts @@ -18,13 +18,13 @@ import { NodeTypes } from '@/node-types'; import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; +import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; import { WebhookService } from './webhook.service'; import type { IWebhookResponseCallbackData, IWebhookManager, WaitingWebhookRequest, } from './webhook.types'; -import { sanitizeWebhookRequest } from './webhook-request-sanitizer'; /** * Service for handling the execution of webhooks of Wait nodes that use the diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts index 50447f8225..5312cf2aee 100644 --- a/packages/cli/src/webhooks/webhook-helpers.ts +++ b/packages/cli/src/webhooks/webhook-helpers.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-argument */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -/* eslint-disable @typescript-eslint/no-shadow */ + /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable id-denylist */ /* eslint-disable prefer-spread */ diff --git a/packages/cli/src/webhooks/webhook-request-sanitizer.ts b/packages/cli/src/webhooks/webhook-request-sanitizer.ts index ba70a1633e..32c54b07b9 100644 --- a/packages/cli/src/webhooks/webhook-request-sanitizer.ts +++ b/packages/cli/src/webhooks/webhook-request-sanitizer.ts @@ -1,6 +1,7 @@ -import { AUTH_COOKIE_NAME } from '@/constants'; import type { Request } from 'express'; +import { AUTH_COOKIE_NAME } from '@/constants'; + const BROWSER_ID_COOKIE_NAME = 'n8n-browserId'; const DISALLOWED_COOKIES = new Set([AUTH_COOKIE_NAME, BROWSER_ID_COOKIE_NAME]); diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index c8c34db6f8..171feb2821 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -/* eslint-disable @typescript-eslint/no-use-before-define */ + /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import type { PushMessage, PushType } from '@n8n/api-types'; diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts index 343a8dd873..fefdaa3785 100644 --- a/packages/cli/src/workflow-runner.ts +++ b/packages/cli/src/workflow-runner.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-argument */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -/* eslint-disable @typescript-eslint/no-shadow */ + /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; @@ -200,7 +200,7 @@ export class WorkflowRunner { } /** Run the workflow in current process */ - // eslint-disable-next-line complexity + private async runMainProcess( executionId: string, data: IWorkflowExecutionDataProcess, diff --git a/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts index e0c057c677..8be8f8c758 100644 --- a/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts +++ b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts @@ -1,7 +1,5 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import { User } from '@n8n/db'; -import { WorkflowHistoryRepository } from '@n8n/db'; +import { mockLogger, mockInstance } from '@n8n/backend-test-utils'; +import { User, WorkflowHistoryRepository } from '@n8n/db'; import { mockClear } from 'jest-mock-extended'; import { WorkflowFinderService } from '@/workflows/workflow-finder.service'; diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts index 4fcba4a4d5..725ba9cea8 100644 --- a/packages/cli/test/integration/active-workflow-manager.test.ts +++ b/packages/cli/test/integration/active-workflow-manager.test.ts @@ -1,6 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import type { WebhookEntity } from '@n8n/db'; import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/ai/ai.api.test.ts b/packages/cli/test/integration/ai/ai.api.test.ts index 6f347c4d53..a7009028a6 100644 --- a/packages/cli/test/integration/ai/ai.api.test.ts +++ b/packages/cli/test/integration/ai/ai.api.test.ts @@ -1,10 +1,11 @@ import { testDb } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import type { Project, User } from '@n8n/db'; +import { + CredentialsRepository, + ProjectRepository, + SharedCredentialsRepository, + UserRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { randomUUID } from 'crypto'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts index 7dd67025ca..8f6ff0e0c0 100644 --- a/packages/cli/test/integration/api-keys.api.test.ts +++ b/packages/cli/test/integration/api-keys.api.test.ts @@ -1,7 +1,5 @@ import type { ApiKeyWithRawValue } from '@n8n/api-types'; -import { testDb } from '@n8n/backend-test-utils'; -import { randomValidPassword } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { testDb, randomValidPassword, mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { User } from '@n8n/db'; import { ApiKeyRepository } from '@n8n/db'; diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts index ed28e34149..1a2a9ff521 100644 --- a/packages/cli/test/integration/auth.api.test.ts +++ b/packages/cli/test/integration/auth.api.test.ts @@ -1,5 +1,4 @@ -import { randomValidPassword } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { randomValidPassword, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/binary-data.api.test.ts b/packages/cli/test/integration/binary-data.api.test.ts index 4403cc1f6e..cdc09b0fd3 100644 --- a/packages/cli/test/integration/binary-data.api.test.ts +++ b/packages/cli/test/integration/binary-data.api.test.ts @@ -14,7 +14,7 @@ const throwFileNotFound = () => { }; const binaryDataService = mockInstance(BinaryDataService); -let testServer = setupTestServer({ endpointGroups: ['binaryData'] }); +const testServer = setupTestServer({ endpointGroups: ['binaryData'] }); let authOwnerAgent: SuperAgentTest; beforeAll(async () => { diff --git a/packages/cli/test/integration/collaboration/collaboration.service.test.ts b/packages/cli/test/integration/collaboration/collaboration.service.test.ts index 2eaa46c486..1306e19034 100644 --- a/packages/cli/test/integration/collaboration/collaboration.service.test.ts +++ b/packages/cli/test/integration/collaboration/collaboration.service.test.ts @@ -1,6 +1,9 @@ -import { createWorkflow, shareWorkflowWithUsers } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createWorkflow, + shareWorkflowWithUsers, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/commands/credentials.cmd.test.ts b/packages/cli/test/integration/commands/credentials.cmd.test.ts index b69c3ec6d4..1ec4ec4dd4 100644 --- a/packages/cli/test/integration/commands/credentials.cmd.test.ts +++ b/packages/cli/test/integration/commands/credentials.cmd.test.ts @@ -1,5 +1,4 @@ -import { getPersonalProject, mockInstance } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { getPersonalProject, mockInstance, testDb } from '@n8n/backend-test-utils'; import { nanoid } from 'nanoid'; import '@/zod-alias-support'; diff --git a/packages/cli/test/integration/commands/import.cmd.test.ts b/packages/cli/test/integration/commands/import.cmd.test.ts index 1d55b9ae41..49064ff9d7 100644 --- a/packages/cli/test/integration/commands/import.cmd.test.ts +++ b/packages/cli/test/integration/commands/import.cmd.test.ts @@ -1,6 +1,10 @@ -import { mockInstance, testDb } from '@n8n/backend-test-utils'; -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { getAllSharedWorkflows, getAllWorkflows } from '@n8n/backend-test-utils'; +import { + mockInstance, + testDb, + getPersonalProject, + getAllSharedWorkflows, + getAllWorkflows, +} from '@n8n/backend-test-utils'; import { nanoid } from 'nanoid'; import '@/zod-alias-support'; diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index b5a25445c6..3be9485658 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -3,13 +3,15 @@ import { findProject, getPersonalProject, mockInstance, + createWorkflow, + randomCredentialPayload, } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { CredentialsRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { + CredentialsRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { EntityNotFoundError } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts index 1f430f8c00..f5968db155 100644 --- a/packages/cli/test/integration/commands/reset.cmd.test.ts +++ b/packages/cli/test/integration/commands/reset.cmd.test.ts @@ -1,12 +1,18 @@ -import { getPersonalProject, mockInstance } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { CredentialsEntity, SettingsRepository } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { + getPersonalProject, + mockInstance, + createWorkflow, + testDb, + randomCredentialPayload, +} from '@n8n/backend-test-utils'; +import { + CredentialsEntity, + SettingsRepository, + CredentialsRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, + UserRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { Reset } from '@/commands/user-management/reset'; diff --git a/packages/cli/test/integration/commands/update/workflow.test.ts b/packages/cli/test/integration/commands/update/workflow.test.ts index 9403a7e725..04c5d2102e 100644 --- a/packages/cli/test/integration/commands/update/workflow.test.ts +++ b/packages/cli/test/integration/commands/update/workflow.test.ts @@ -1,5 +1,9 @@ -import { mockInstance, testDb } from '@n8n/backend-test-utils'; -import { createWorkflowWithTrigger, getAllWorkflows } from '@n8n/backend-test-utils'; +import { + mockInstance, + testDb, + createWorkflowWithTrigger, + getAllWorkflows, +} from '@n8n/backend-test-utils'; import { UpdateWorkflowCommand } from '@/commands/update/workflow'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/community-packages.api.test.ts b/packages/cli/test/integration/community-packages.api.test.ts index 09eb9e7bc2..d6c75610d3 100644 --- a/packages/cli/test/integration/community-packages.api.test.ts +++ b/packages/cli/test/integration/community-packages.api.test.ts @@ -1,6 +1,5 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import type { InstalledNodes } from '@n8n/db'; -import type { InstalledPackages } from '@n8n/db'; +import type { InstalledNodes, InstalledPackages } from '@n8n/db'; import path from 'path'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts index be6f5ea444..47d9172047 100644 --- a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts +++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts @@ -6,8 +6,7 @@ import { randomValidPassword, } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; -import { ProjectRelationRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { ProjectRelationRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Not } from '@n8n/typeorm'; diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts index 09eab922db..e098d7c95b 100644 --- a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts +++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts @@ -1,6 +1,5 @@ import { testDb } from '@n8n/backend-test-utils'; -import type { CredentialsEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import type { CredentialsEntity, User } from '@n8n/db'; import { Container } from '@n8n/di'; import { response as Response } from 'express'; import nock from 'nock'; diff --git a/packages/cli/test/integration/credentials-helper.test.ts b/packages/cli/test/integration/credentials-helper.test.ts index 89c4bfaea9..c1f47ae267 100644 --- a/packages/cli/test/integration/credentials-helper.test.ts +++ b/packages/cli/test/integration/credentials-helper.test.ts @@ -1,6 +1,9 @@ -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { + createTeamProject, + linkUserToProject, + randomCredentialPayload, + testDb, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts index e7f3485ed3..ceafb94eda 100644 --- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts @@ -1,16 +1,15 @@ -import { createWorkflow, shareWorkflowWithUsers } from '@n8n/backend-test-utils'; -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; import { + createWorkflow, + shareWorkflowWithUsers, + createTeamProject, + linkUserToProject, randomCredentialPayload, randomCredentialPayloadWithOauthTokenData, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { ListQueryDb } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; +import type { Project, User, ListQueryDb } from '@n8n/db'; +import { ProjectRepository, SharedCredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { ProjectRole } from '@n8n/permissions'; import { In } from '@n8n/typeorm'; @@ -33,8 +32,7 @@ import { createUser, createUserShell, } from '../shared/db/users'; -import type { SaveCredentialFunction } from '../shared/types'; -import type { SuperAgentTest } from '../shared/types'; +import type { SaveCredentialFunction, SuperAgentTest } from '../shared/types'; import * as utils from '../shared/utils'; const testServer = utils.setupTestServer({ diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts index 377bc3c012..9a4cbb706f 100644 --- a/packages/cli/test/integration/credentials/credentials.api.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.test.ts @@ -1,18 +1,15 @@ -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; import { + createTeamProject, + linkUserToProject, randomCredentialPayload as payload, randomCredentialPayload, randomCredentialPayloadWithOauthTokenData, randomName, + testDb, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { ListQueryDb } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; +import type { Project, User, ListQueryDb } from '@n8n/db'; +import { CredentialsRepository, ProjectRepository, SharedCredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Scope } from '@sentry/node'; import * as a from 'assert'; diff --git a/packages/cli/test/integration/credentials/credentials.service.test.ts b/packages/cli/test/integration/credentials/credentials.service.test.ts index 93695ce4b0..752e72c66a 100644 --- a/packages/cli/test/integration/credentials/credentials.service.test.ts +++ b/packages/cli/test/integration/credentials/credentials.service.test.ts @@ -1,8 +1,10 @@ -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import type { CredentialsEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; +import { + createTeamProject, + linkUserToProject, + randomCredentialPayload, + testDb, +} from '@n8n/backend-test-utils'; +import type { CredentialsEntity, User } from '@n8n/db'; import { Container } from '@n8n/di'; import { CredentialsFinderService } from '@/credentials/credentials-finder.service'; diff --git a/packages/cli/test/integration/cta.service.test.ts b/packages/cli/test/integration/cta.service.test.ts index 40a8ea6cbb..645d2f85ac 100644 --- a/packages/cli/test/integration/cta.service.test.ts +++ b/packages/cli/test/integration/cta.service.test.ts @@ -1,5 +1,4 @@ -import { createManyWorkflows } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createManyWorkflows, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { StatisticsNames } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts index 0cb6cba976..d72c0468a2 100644 --- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts @@ -1,8 +1,6 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import { ExecutionDataRepository } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; +import { ExecutionDataRepository, ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; describe('ExecutionRepository', () => { diff --git a/packages/cli/test/integration/database/repositories/project.repository.test.ts b/packages/cli/test/integration/database/repositories/project.repository.test.ts index 6d8412e5b2..a747e50245 100644 --- a/packages/cli/test/integration/database/repositories/project.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/project.repository.test.ts @@ -1,8 +1,5 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { AuthIdentity } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { createTeamProject, testDb } from '@n8n/backend-test-utils'; +import { AuthIdentity, ProjectRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { EntityNotFoundError } from '@n8n/typeorm'; diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts index a79ca16548..17715a6888 100644 --- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts @@ -2,8 +2,8 @@ import { createWorkflowWithTrigger, createWorkflow, getAllWorkflows, + testDb, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts index 93a7b17377..64a801d6eb 100644 --- a/packages/cli/test/integration/debug.controller.test.ts +++ b/packages/cli/test/integration/debug.controller.test.ts @@ -1,8 +1,6 @@ -import { randomName } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { randomName, mockInstance } from '@n8n/backend-test-utils'; import type { WorkflowEntity } from '@n8n/db'; -import { generateNanoId } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { generateNanoId, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { InstanceSettings } from 'n8n-core'; @@ -19,7 +17,7 @@ describe('DebugController', () => { const instanceSettings = Container.get(InstanceSettings); instanceSettings.markAsLeader(); - let testServer = setupTestServer({ endpointGroups: ['debug'] }); + const testServer = setupTestServer({ endpointGroups: ['debug'] }); let ownerAgent: SuperAgentTest; beforeAll(async () => { diff --git a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts index 29d9c0496b..de222ef321 100644 --- a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts +++ b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts @@ -1,9 +1,11 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { DataDeduplicationService } from 'n8n-core'; -import type { ICheckProcessedContextData } from 'n8n-workflow'; -import type { IDeduplicationOutput, INode, DeduplicationItemTypes } from 'n8n-workflow'; +import type { + ICheckProcessedContextData, + IDeduplicationOutput, + INode, + DeduplicationItemTypes, +} from 'n8n-workflow'; import { Workflow } from 'n8n-workflow'; import { getDataDeduplicationService } from '@/deduplication'; diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts index 66ed1c8c0e..d2974ba272 100644 --- a/packages/cli/test/integration/environments/source-control-import.service.test.ts +++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts @@ -1,9 +1,13 @@ import type { SourceControlledFile } from '@n8n/api-types'; -import { createTeamProject, getPersonalProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + getPersonalProject, + linkUserToProject, + createWorkflow, + randomCredentialPayload, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import { type CredentialsEntity, CredentialsRepository, @@ -16,10 +20,12 @@ import { WorkflowRepository, WorkflowTagMappingRepository, } from '@n8n/db'; -import { FolderRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { + FolderRepository, + ProjectRepository, + SharedCredentialsRepository, + UserRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import * as fastGlob from 'fast-glob'; import { mock } from 'jest-mock-extended'; @@ -337,7 +343,7 @@ describe('SourceControlImportService', () => { describe('if user is an instance owner', () => { it('should get all available workflows on the instance', async () => { - let versions = await service.getLocalVersionIdsFromDb( + const versions = await service.getLocalVersionIdsFromDb( new SourceControlContext(instanceOwner), ); @@ -355,7 +361,7 @@ describe('SourceControlImportService', () => { describe('if user is a project admin of a team project', () => { it('should only get all available workflows from the team project', async () => { - let versions = await service.getLocalVersionIdsFromDb( + const versions = await service.getLocalVersionIdsFromDb( new SourceControlContext(projectAdmin), ); @@ -367,7 +373,7 @@ describe('SourceControlImportService', () => { describe('if user is a project member of a team project', () => { it('should not get any workflows', async () => { - let versions = await service.getLocalVersionIdsFromDb( + const versions = await service.getLocalVersionIdsFromDb( new SourceControlContext(projectMember), ); @@ -627,7 +633,7 @@ describe('SourceControlImportService', () => { }); it('should get all available credentials on the instance, for an instance owner', async () => { - let versions = await service.getLocalCredentialsFromDb( + const versions = await service.getLocalCredentialsFromDb( new SourceControlContext(instanceOwner), ); @@ -637,7 +643,7 @@ describe('SourceControlImportService', () => { }); it('should only get all available credentials from the team project, for a project admin', async () => { - let versions = await service.getLocalCredentialsFromDb( + const versions = await service.getLocalCredentialsFromDb( new SourceControlContext(projectAdmin), ); @@ -647,7 +653,7 @@ describe('SourceControlImportService', () => { }); it('should not get any workflows, for a project member', async () => { - let versions = await service.getLocalCredentialsFromDb( + const versions = await service.getLocalCredentialsFromDb( new SourceControlContext(projectMember), ); @@ -711,7 +717,7 @@ describe('SourceControlImportService', () => { }); it('should get all available folders on the instance, for an instance owner', async () => { - let folders = await service.getLocalFoldersAndMappingsFromDb( + const folders = await service.getLocalFoldersAndMappingsFromDb( new SourceControlContext(instanceOwner), ); @@ -721,7 +727,7 @@ describe('SourceControlImportService', () => { }); it('should only get all available folders from the team project, for a project admin', async () => { - let versions = await service.getLocalFoldersAndMappingsFromDb( + const versions = await service.getLocalFoldersAndMappingsFromDb( new SourceControlContext(projectAdmin), ); @@ -731,7 +737,7 @@ describe('SourceControlImportService', () => { }); it('should not get any folders, for a project member', async () => { - let versions = await service.getLocalFoldersAndMappingsFromDb( + const versions = await service.getLocalFoldersAndMappingsFromDb( new SourceControlContext(projectMember), ); @@ -1014,7 +1020,7 @@ describe('SourceControlImportService', () => { }); it('should get all available tags and mappings on the instance, for an instance owner', async () => { - let result = await service.getLocalTagsAndMappingsFromDb( + const result = await service.getLocalTagsAndMappingsFromDb( new SourceControlContext(instanceOwner), ); @@ -1035,7 +1041,7 @@ describe('SourceControlImportService', () => { }); it('should only get all available tags and only mappings from the team project, for a project admin', async () => { - let result = await service.getLocalTagsAndMappingsFromDb( + const result = await service.getLocalTagsAndMappingsFromDb( new SourceControlContext(projectAdmin), ); @@ -1059,7 +1065,7 @@ describe('SourceControlImportService', () => { }); it('should get all available tags but no mappings, for a project member', async () => { - let result = await service.getLocalTagsAndMappingsFromDb( + const result = await service.getLocalTagsAndMappingsFromDb( new SourceControlContext(projectMember), ); diff --git a/packages/cli/test/integration/environments/source-control.service.test.ts b/packages/cli/test/integration/environments/source-control.service.test.ts index 48d808d8e2..c44297cb12 100644 --- a/packages/cli/test/integration/environments/source-control.service.test.ts +++ b/packages/cli/test/integration/environments/source-control.service.test.ts @@ -1,7 +1,5 @@ import type { SourceControlledFile } from '@n8n/api-types'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createTeamProject, createWorkflow, testDb } from '@n8n/backend-test-utils'; import { CredentialsEntity, type Folder, @@ -229,7 +227,7 @@ describe('SourceControlService', () => { createTeamProject('ProjectB'), ]); - let [ + const [ globalAdminWorkflows, globalOwnerWorkflows, globalMemberWorkflows, @@ -324,7 +322,7 @@ describe('SourceControlService', () => { ), ]); - let [projectACredentials, projectBCredentials] = await Promise.all( + const [projectACredentials, projectBCredentials] = await Promise.all( [projectA, projectB].map(async (project) => [ await createCredentials( { @@ -367,7 +365,7 @@ describe('SourceControlService', () => { }), ); - let [projectAFolders, projectBFolders] = await Promise.all( + const [projectAFolders, projectBFolders] = await Promise.all( [projectA, projectB].map(async (project) => { const parent = await createFolder(project, { name: `${project.name}-FolderA`, @@ -536,7 +534,7 @@ describe('SourceControlService', () => { describe('direction: push', () => { describe('global:admin user', () => { it('should see all workflows', async () => { - let result = await service.getStatus(globalAdmin, { + const result = await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -600,7 +598,7 @@ describe('SourceControlService', () => { }); it('should see all credentials', async () => { - let result = await service.getStatus(globalAdmin, { + const result = await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -637,7 +635,7 @@ describe('SourceControlService', () => { }); it('should see all folder', async () => { - let result = await service.getStatus(globalAdmin, { + const result = await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -664,7 +662,7 @@ describe('SourceControlService', () => { describe('global:member user', () => { it('should see nothing', async () => { - let result = await service.getStatus(globalMember, { + const result = await service.getStatus(globalMember, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -676,7 +674,7 @@ describe('SourceControlService', () => { describe('project:Admin user', () => { it('should see only workflows in correct scope', async () => { - let result = await service.getStatus(projectAdmin, { + const result = await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -736,7 +734,7 @@ describe('SourceControlService', () => { }); it('should see only credentials in correct scope', async () => { - let result = await service.getStatus(projectAdmin, { + const result = await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -773,7 +771,7 @@ describe('SourceControlService', () => { }); it('should see only folders in correct scope', async () => { - let result = await service.getStatus(projectAdmin, { + const result = await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -836,7 +834,7 @@ describe('SourceControlService', () => { }); it('should fail with BadRequest', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -853,7 +851,7 @@ describe('SourceControlService', () => { describe('global:admin user', () => { it('should update all workflows, credentials, tags and folder', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -887,7 +885,7 @@ describe('SourceControlService', () => { }); it('should update all workflows and credentials without arguments', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -940,7 +938,7 @@ describe('SourceControlService', () => { describe('project:admin', () => { it('should update selected workflows, credentials, tags and folders', async () => { - let allChanges = (await service.getStatus(projectAdmin, { + const allChanges = (await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -974,7 +972,7 @@ describe('SourceControlService', () => { }); it('should throw ForbiddenError when trying to push workflows out of scope', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -995,7 +993,7 @@ describe('SourceControlService', () => { }); it('should throw ForbiddenError when trying to push credentials out of scope', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -1035,7 +1033,7 @@ describe('SourceControlService', () => { // Add a new tag to newly assigned workflow await assignTagToWorkflow(tags[1], movedIntoScopeWorkflow); - let allChanges = (await service.getStatus(projectAdmin, { + const allChanges = (await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -1065,7 +1063,7 @@ describe('SourceControlService', () => { }); it('should update folders in scope and keep out of scope ones', async () => { - let allChanges = (await service.getStatus(projectAdmin, { + const allChanges = (await service.getStatus(projectAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -1103,7 +1101,7 @@ describe('SourceControlService', () => { describe('global:member', () => { it('should deny all changes', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, @@ -1118,7 +1116,7 @@ describe('SourceControlService', () => { }); it('should deny any changes', async () => { - let allChanges = (await service.getStatus(globalAdmin, { + const allChanges = (await service.getStatus(globalAdmin, { direction: 'push', preferLocalVersion: true, verbose: false, diff --git a/packages/cli/test/integration/evaluation/test-runs.api.test.ts b/packages/cli/test/integration/evaluation/test-runs.api.test.ts index cbc4b78e2b..40916fd23a 100644 --- a/packages/cli/test/integration/evaluation/test-runs.api.test.ts +++ b/packages/cli/test/integration/evaluation/test-runs.api.test.ts @@ -1,8 +1,6 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { TestRunRepository } from '@n8n/db'; +import { ProjectRepository, TestRunRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mockInstance } from 'n8n-core/test/utils'; import type { IWorkflowBase } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/execution.repository.test.ts b/packages/cli/test/integration/execution.repository.test.ts index 3e59b5a852..2006829358 100644 --- a/packages/cli/test/integration/execution.repository.test.ts +++ b/packages/cli/test/integration/execution.repository.test.ts @@ -1,5 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import { ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts index e8998a8301..5ccbe9a4a3 100644 --- a/packages/cli/test/integration/execution.service.integration.test.ts +++ b/packages/cli/test/integration/execution.service.integration.test.ts @@ -1,10 +1,6 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createTeamProject, createWorkflow, testDb } from '@n8n/backend-test-utils'; import type { ExecutionSummaries } from '@n8n/db'; -import { ExecutionMetadataRepository } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { ExecutionMetadataRepository, ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/executions-pruning.service.test.ts b/packages/cli/test/integration/executions-pruning.service.test.ts index 0ae284a422..c23aca8e98 100644 --- a/packages/cli/test/integration/executions-pruning.service.test.ts +++ b/packages/cli/test/integration/executions-pruning.service.test.ts @@ -1,12 +1,8 @@ -import { mockLogger } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { mockLogger, createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { ExecutionsConfig } from '@n8n/config'; import { Time } from '@n8n/constants'; import type { ExecutionEntity } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; -import { DbConnection } from '@n8n/db'; +import { ExecutionRepository, DbConnection } from '@n8n/db'; import { Container } from '@n8n/di'; import { BinaryDataService, InstanceSettings } from 'n8n-core'; import type { ExecutionStatus, IWorkflowBase } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts index a03f3b77dc..10cd5828fc 100644 --- a/packages/cli/test/integration/executions.controller.test.ts +++ b/packages/cli/test/integration/executions.controller.test.ts @@ -1,7 +1,11 @@ -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { createWorkflow, shareWorkflowWithUsers } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + linkUserToProject, + createWorkflow, + shareWorkflowWithUsers, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; diff --git a/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts b/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts index 81886039d7..2a6e89361d 100644 --- a/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts +++ b/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts @@ -1,13 +1,16 @@ -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { randomCredentialPayload as randomCred } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { + getPersonalProject, + randomCredentialPayload as randomCred, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; +import type { Project, User } from '@n8n/db'; +import { + ProjectRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { INode, IWorkflowBase } from 'n8n-workflow'; import { randomInt } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts index b5ed195eed..32a666749e 100644 --- a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts +++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts @@ -1,6 +1,5 @@ import { LicenseState } from '@n8n/backend-common'; -import { mockLogger } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { mockLogger, mockInstance } from '@n8n/backend-test-utils'; import { SettingsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts index c26ed67919..18ca545cba 100644 --- a/packages/cli/test/integration/folder/folder.controller.test.ts +++ b/packages/cli/test/integration/folder/folder.controller.test.ts @@ -1,14 +1,16 @@ import { faker } from '@faker-js/faker'; -import { createWorkflow, getWorkflowSharing } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { createTeamProject, getPersonalProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { Project, ProjectRole } from '@n8n/db'; -import type { User } from '@n8n/db'; -import { FolderRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { + createWorkflow, + getWorkflowSharing, + randomCredentialPayload, + createTeamProject, + getPersonalProject, + linkUserToProject, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; +import type { Project, ProjectRole, User } from '@n8n/db'; +import { FolderRepository, ProjectRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; import { ApplicationError, PROJECT_ROOT } from 'n8n-workflow'; @@ -676,7 +678,7 @@ describe('PATCH /projects/:projectId/folders/:folderId', () => { }); // Verify initial state - let folder = await folderRepository.findOne({ + const folder = await folderRepository.findOne({ where: { id: folderToMove.id }, relations: ['parentFolder'], }); diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts index c83637fbe2..ce787000ac 100644 --- a/packages/cli/test/integration/import.service.test.ts +++ b/packages/cli/test/integration/import.service.test.ts @@ -1,18 +1,19 @@ -import { getPersonalProject } from '@n8n/backend-test-utils'; import { + getPersonalProject, createWorkflow, getAllSharedWorkflows, getWorkflowById, newWorkflow, + testDb, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import { TagEntity } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { TagRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import type { Project, User } from '@n8n/db'; +import { + TagEntity, + CredentialsRepository, + TagRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import type { INode } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/insights/insights.api.test.ts b/packages/cli/test/integration/insights/insights.api.test.ts index 0620573f48..7d73f2bb81 100644 --- a/packages/cli/test/integration/insights/insights.api.test.ts +++ b/packages/cli/test/integration/insights/insights.api.test.ts @@ -9,7 +9,7 @@ import * as utils from '../shared/utils'; mockInstance(Telemetry); -let agents: Record = {}; +const agents: Record = {}; const testServer = utils.setupTestServer({ endpointGroups: ['insights', 'license', 'auth'], enabledFeatures: ['feat:insights:viewSummary', 'feat:insights:viewDashboard'], diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index ddd632fe1a..5975fba9e7 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -1,10 +1,13 @@ -import { randomEmail, randomName, uniqueId } from '@n8n/backend-test-utils'; -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { + randomEmail, + randomName, + uniqueId, + getPersonalProject, + testDb, +} from '@n8n/backend-test-utils'; import { LDAP_DEFAULT_CONFIGURATION } from '@n8n/constants'; import type { User } from '@n8n/db'; -import { AuthProviderSyncHistoryRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { AuthProviderSyncHistoryRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Not } from '@n8n/typeorm'; import type { Entry as LdapUser } from 'ldapts'; diff --git a/packages/cli/test/integration/license-metrics.repository.test.ts b/packages/cli/test/integration/license-metrics.repository.test.ts index 95f442b1c3..7cb84f9c23 100644 --- a/packages/cli/test/integration/license-metrics.repository.test.ts +++ b/packages/cli/test/integration/license-metrics.repository.test.ts @@ -1,8 +1,5 @@ -import { createManyWorkflows } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { StatisticsNames } from '@n8n/db'; -import { LicenseMetricsRepository } from '@n8n/db'; -import { WorkflowStatisticsRepository } from '@n8n/db'; +import { createManyWorkflows, testDb } from '@n8n/backend-test-utils'; +import { StatisticsNames, LicenseMetricsRepository, WorkflowStatisticsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { createManyCredentials } from './shared/db/credentials'; diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts index a486bd6fec..6fb7b19776 100644 --- a/packages/cli/test/integration/me.api.test.ts +++ b/packages/cli/test/integration/me.api.test.ts @@ -1,10 +1,13 @@ -import { randomEmail, randomName, randomValidPassword } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + randomEmail, + randomName, + randomValidPassword, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { User } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { ProjectRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow'; import validator from 'validator'; diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts index 5f14952542..83e760d680 100644 --- a/packages/cli/test/integration/mfa/mfa.api.test.ts +++ b/packages/cli/test/integration/mfa/mfa.api.test.ts @@ -1,6 +1,4 @@ -import { randomValidPassword, uniqueId } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { randomValidPassword, uniqueId, testDb, mockInstance } from '@n8n/backend-test-utils'; import { LICENSE_FEATURES } from '@n8n/constants'; import { SettingsRepository, UserRepository, type User } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts index 3198f2f5e2..2238c6e05f 100644 --- a/packages/cli/test/integration/owner.api.test.ts +++ b/packages/cli/test/integration/owner.api.test.ts @@ -3,8 +3,8 @@ import { randomInvalidPassword, randomName, randomValidPassword, + testDb, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/password-reset.api.test.ts b/packages/cli/test/integration/password-reset.api.test.ts index 394cdeca03..3a22405b0b 100644 --- a/packages/cli/test/integration/password-reset.api.test.ts +++ b/packages/cli/test/integration/password-reset.api.test.ts @@ -3,9 +3,9 @@ import { randomInvalidPassword, randomName, randomValidPassword, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/project.api.test.ts b/packages/cli/test/integration/project.api.test.ts index 06d6db7b97..e0de9be6bf 100644 --- a/packages/cli/test/integration/project.api.test.ts +++ b/packages/cli/test/integration/project.api.test.ts @@ -4,18 +4,21 @@ import { getPersonalProject, findProject, getProjectRelations, + createWorkflow, + shareWorkflowWithProjects, + randomCredentialPayload, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { createWorkflow, shareWorkflowWithProjects } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import type { Project } from '@n8n/db'; -import { FolderRepository } from '@n8n/db'; -import { ProjectRelationRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; +import { + FolderRepository, + ProjectRelationRepository, + ProjectRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { getRoleScopes, type GlobalRole, type ProjectRole, type Scope } from '@n8n/permissions'; import { EntityNotFoundError } from '@n8n/typeorm'; diff --git a/packages/cli/test/integration/project.service.integration.test.ts b/packages/cli/test/integration/project.service.integration.test.ts index 2561f78abe..2208f3030b 100644 --- a/packages/cli/test/integration/project.service.integration.test.ts +++ b/packages/cli/test/integration/project.service.integration.test.ts @@ -2,9 +2,9 @@ import { linkUserToProject, createTeamProject, getAllProjectRelations, + createWorkflow, + testDb, } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; import { SharedWorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/public-api/credentials.test.ts b/packages/cli/test/integration/public-api/credentials.test.ts index ceefffe251..5ebafb2aa6 100644 --- a/packages/cli/test/integration/public-api/credentials.test.ts +++ b/packages/cli/test/integration/public-api/credentials.test.ts @@ -1,10 +1,7 @@ import type { CredentialPayload } from '@n8n/backend-test-utils'; -import { createTeamProject } from '@n8n/backend-test-utils'; -import { randomName } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createTeamProject, randomName, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; +import { CredentialsRepository, SharedCredentialsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { randomString } from 'n8n-workflow'; @@ -14,8 +11,7 @@ import { getCredentialSharings, } from '../shared/db/credentials'; import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users'; -import type { SaveCredentialFunction } from '../shared/types'; -import type { SuperAgentTest } from '../shared/types'; +import type { SaveCredentialFunction, SuperAgentTest } from '../shared/types'; import * as utils from '../shared/utils/'; let owner: User; diff --git a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts index 3103833b4e..673fdef04c 100644 --- a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts +++ b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts @@ -1,15 +1,20 @@ import type { CredentialPayload } from '@n8n/backend-test-utils'; -import { createTeamProject, getProjectByNameOrFail } from '@n8n/backend-test-utils'; -import { createWorkflow } from '@n8n/backend-test-utils'; -import { randomName } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { + createTeamProject, + getProjectByNameOrFail, + createWorkflow, + randomName, + testDb, +} from '@n8n/backend-test-utils'; import type { TagEntity, Variables } from '@n8n/db'; -import { ApiKeyRepository } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { TagRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; +import { + ApiKeyRepository, + CredentialsRepository, + ProjectRepository, + TagRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { getOwnerOnlyApiKeyScopes } from '@n8n/permissions'; import { randomString } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/public-api/executions.test.ts b/packages/cli/test/integration/public-api/executions.test.ts index 4daf947ecc..c423f0710a 100644 --- a/packages/cli/test/integration/public-api/executions.test.ts +++ b/packages/cli/test/integration/public-api/executions.test.ts @@ -1,13 +1,12 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; import { + createTeamProject, createManyWorkflows, createWorkflow, shareWorkflowWithUsers, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { User } from '@n8n/db'; -import type { ExecutionEntity } from '@n8n/db'; +import type { User, ExecutionEntity } from '@n8n/db'; import type { ActiveWorkflowManager } from '@/active-workflow-manager'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/public-api/projects.test.ts b/packages/cli/test/integration/public-api/projects.test.ts index e5cb1baaa4..7b106829a0 100644 --- a/packages/cli/test/integration/public-api/projects.test.ts +++ b/packages/cli/test/integration/public-api/projects.test.ts @@ -4,9 +4,9 @@ import { linkUserToProject, getAllProjectRelations, getProjectRoleForUser, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/public-api/users.ee.test.ts b/packages/cli/test/integration/public-api/users.ee.test.ts index d457fa0ac6..ead728b7f5 100644 --- a/packages/cli/test/integration/public-api/users.ee.test.ts +++ b/packages/cli/test/integration/public-api/users.ee.test.ts @@ -1,6 +1,9 @@ -import { createTeamProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + linkUserToProject, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { v4 as uuid } from 'uuid'; import validator from 'validator'; diff --git a/packages/cli/test/integration/public-api/users.test.ts b/packages/cli/test/integration/public-api/users.test.ts index 488be7dedc..8c120bd2f2 100644 --- a/packages/cli/test/integration/public-api/users.test.ts +++ b/packages/cli/test/integration/public-api/users.test.ts @@ -1,5 +1,4 @@ -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { testDb, mockInstance } from '@n8n/backend-test-utils'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts index c1eb911553..cc2cfc40ef 100644 --- a/packages/cli/test/integration/public-api/workflows.test.ts +++ b/packages/cli/test/integration/public-api/workflows.test.ts @@ -1,14 +1,13 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflow, createWorkflowWithTrigger } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + createWorkflow, + createWorkflowWithTrigger, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import type { Project } from '@n8n/db'; -import type { TagEntity } from '@n8n/db'; -import type { User } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { WorkflowHistoryRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; +import type { Project, TagEntity, User } from '@n8n/db'; +import { ProjectRepository, WorkflowHistoryRepository, SharedWorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { InstanceSettings } from 'n8n-core'; import type { INode } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/saml/saml-helpers.test.ts b/packages/cli/test/integration/saml/saml-helpers.test.ts index a4d1253ee5..943377bcc2 100644 --- a/packages/cli/test/integration/saml/saml-helpers.test.ts +++ b/packages/cli/test/integration/saml/saml-helpers.test.ts @@ -1,5 +1,4 @@ -import { getPersonalProject } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { getPersonalProject, testDb } from '@n8n/backend-test-utils'; import * as helpers from '@/sso.ee/saml/saml-helpers'; import type { SamlUserAttributes } from '@/sso.ee/saml/types'; diff --git a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts index f5bdb0f30b..3a532ac203 100644 --- a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts @@ -1,10 +1,12 @@ import { testDb } from '@n8n/backend-test-utils'; import type { SecurityConfig } from '@n8n/config'; -import { generateNanoId } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { ExecutionDataRepository } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { + generateNanoId, + CredentialsRepository, + ExecutionDataRepository, + ExecutionRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts index 679199b9ec..f8a6460599 100644 --- a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts @@ -1,6 +1,5 @@ import { testDb } from '@n8n/backend-test-utils'; -import { generateNanoId } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { generateNanoId, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts index 2bf7df5e41..93d407dccc 100644 --- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts @@ -1,7 +1,6 @@ import { testDb } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; -import { generateNanoId } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { generateNanoId, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { NodeConnectionTypes } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts index 0850487dc5..8fd6cb41eb 100644 --- a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts @@ -1,5 +1,4 @@ -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { testDb, mockInstance } from '@n8n/backend-test-utils'; import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/security-audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts index 219d7e8408..8d265dccbe 100644 --- a/packages/cli/test/integration/security-audit/utils.ts +++ b/packages/cli/test/integration/security-audit/utils.ts @@ -1,6 +1,5 @@ import { GlobalConfig } from '@n8n/config'; -import type { InstalledNodes } from '@n8n/db'; -import type { InstalledPackages } from '@n8n/db'; +import type { InstalledNodes, InstalledPackages } from '@n8n/db'; import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import nock from 'nock'; diff --git a/packages/cli/test/integration/services/execution-metadata.service.test.ts b/packages/cli/test/integration/services/execution-metadata.service.test.ts index e9c2b6b8dc..fc1cdec11a 100644 --- a/packages/cli/test/integration/services/execution-metadata.service.test.ts +++ b/packages/cli/test/integration/services/execution-metadata.service.test.ts @@ -1,5 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import { ExecutionMetadataRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/services/project.service.test.ts b/packages/cli/test/integration/services/project.service.test.ts index 8fd6b43b32..69b817ae67 100644 --- a/packages/cli/test/integration/services/project.service.test.ts +++ b/packages/cli/test/integration/services/project.service.test.ts @@ -1,6 +1,5 @@ import { testDb } from '@n8n/backend-test-utils'; -import { ProjectRelationRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; +import { ProjectRelationRepository, ProjectRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { ProjectRole, Scope } from '@n8n/permissions'; diff --git a/packages/cli/test/integration/services/workflow-static-data.service.test.ts b/packages/cli/test/integration/services/workflow-static-data.service.test.ts index 2d9f436bba..f384c8dbec 100644 --- a/packages/cli/test/integration/services/workflow-static-data.service.test.ts +++ b/packages/cli/test/integration/services/workflow-static-data.service.test.ts @@ -1,6 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Workflow } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts index a2994e63a3..ce4722066e 100644 --- a/packages/cli/test/integration/shared/db/credentials.ts +++ b/packages/cli/test/integration/shared/db/credentials.ts @@ -1,11 +1,11 @@ import type { CredentialPayload } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { ICredentialsDb } from '@n8n/db'; -import { CredentialsEntity } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; +import type { Project, User, ICredentialsDb } from '@n8n/db'; +import { + CredentialsEntity, + CredentialsRepository, + ProjectRepository, + SharedCredentialsRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { CredentialSharingRole } from '@n8n/permissions'; diff --git a/packages/cli/test/integration/shared/db/evaluation.ts b/packages/cli/test/integration/shared/db/evaluation.ts index 6fa88ec43b..c2b401d1dc 100644 --- a/packages/cli/test/integration/shared/db/evaluation.ts +++ b/packages/cli/test/integration/shared/db/evaluation.ts @@ -1,8 +1,11 @@ import { TestRunRepository, TestCaseExecutionRepository } from '@n8n/db'; -import type { TestRun } from '@n8n/db'; -import type { TestCaseExecution } from '@n8n/db'; -import type { AggregatedTestRunMetrics } from '@n8n/db'; -import type { TestCaseExecutionErrorCode, TestRunErrorCode } from '@n8n/db'; +import type { + TestRun, + TestCaseExecution, + AggregatedTestRunMetrics, + TestCaseExecutionErrorCode, + TestRunErrorCode, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { IDataObject } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/db/executions.ts b/packages/cli/test/integration/shared/db/executions.ts index 0b119c5276..b6a5127bc0 100644 --- a/packages/cli/test/integration/shared/db/executions.ts +++ b/packages/cli/test/integration/shared/db/executions.ts @@ -1,10 +1,11 @@ import { mockInstance } from '@n8n/backend-test-utils'; -import type { ExecutionEntity } from '@n8n/db'; -import type { ExecutionData } from '@n8n/db'; -import { ExecutionDataRepository } from '@n8n/db'; -import { ExecutionMetadataRepository } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; -import { AnnotationTagRepository } from '@n8n/db'; +import type { ExecutionEntity, ExecutionData } from '@n8n/db'; +import { + ExecutionDataRepository, + ExecutionMetadataRepository, + ExecutionRepository, + AnnotationTagRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { AnnotationVote, IWorkflowBase } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/db/folders.ts b/packages/cli/test/integration/shared/db/folders.ts index 47f4b714ab..5ca8bc4122 100644 --- a/packages/cli/test/integration/shared/db/folders.ts +++ b/packages/cli/test/integration/shared/db/folders.ts @@ -1,7 +1,5 @@ import { randomName } from '@n8n/backend-test-utils'; -import type { Folder } from '@n8n/db'; -import type { Project } from '@n8n/db'; -import type { TagEntity } from '@n8n/db'; +import type { Folder, Project, TagEntity } from '@n8n/db'; import { FolderRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/shared/db/tags.ts b/packages/cli/test/integration/shared/db/tags.ts index 59aec0c877..357bb3d9d0 100644 --- a/packages/cli/test/integration/shared/db/tags.ts +++ b/packages/cli/test/integration/shared/db/tags.ts @@ -1,9 +1,6 @@ import { randomName } from '@n8n/backend-test-utils'; -import type { TagEntity } from '@n8n/db'; -import type { WorkflowEntity } from '@n8n/db'; -import { generateNanoId } from '@n8n/db'; -import { TagRepository } from '@n8n/db'; -import { WorkflowTagMappingRepository } from '@n8n/db'; +import type { TagEntity, WorkflowEntity } from '@n8n/db'; +import { generateNanoId, TagRepository, WorkflowTagMappingRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { IWorkflowBase } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts index 4bf4126c8f..a2eb097f44 100644 --- a/packages/cli/test/integration/shared/db/users.ts +++ b/packages/cli/test/integration/shared/db/users.ts @@ -1,8 +1,6 @@ import { randomEmail, randomName, randomValidPassword } from '@n8n/backend-test-utils'; -import { AuthIdentity } from '@n8n/db'; +import { AuthIdentity, AuthIdentityRepository, UserRepository } from '@n8n/db'; import { type User } from '@n8n/db'; -import { AuthIdentityRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { ApiKeyScope, GlobalRole } from '@n8n/permissions'; import { getApiKeyScopesForRole } from '@n8n/permissions'; diff --git a/packages/cli/test/integration/shared/db/variables.ts b/packages/cli/test/integration/shared/db/variables.ts index c703c02443..4673486f0c 100644 --- a/packages/cli/test/integration/shared/db/variables.ts +++ b/packages/cli/test/integration/shared/db/variables.ts @@ -1,5 +1,4 @@ -import { generateNanoId } from '@n8n/db'; -import { VariablesRepository } from '@n8n/db'; +import { generateNanoId, VariablesRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { randomString } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts index 7c9fbcf5e9..9d6c58e757 100644 --- a/packages/cli/test/integration/shared/types.ts +++ b/packages/cli/test/integration/shared/types.ts @@ -1,9 +1,6 @@ import type { CredentialPayload } from '@n8n/backend-test-utils'; import type { BooleanLicenseFeature, NumericLicenseFeature } from '@n8n/constants'; -import type { CredentialsEntity } from '@n8n/db'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { ICredentialsDb } from '@n8n/db'; +import type { CredentialsEntity, Project, User, ICredentialsDb } from '@n8n/db'; import type { Application } from 'express'; import type { Server } from 'http'; import type TestAgent from 'supertest/lib/agent'; diff --git a/packages/cli/test/integration/shared/utils/community-nodes.ts b/packages/cli/test/integration/shared/utils/community-nodes.ts index 5e5d510be6..56b58da129 100644 --- a/packages/cli/test/integration/shared/utils/community-nodes.ts +++ b/packages/cli/test/integration/shared/utils/community-nodes.ts @@ -1,7 +1,5 @@ import { randomName } from '@n8n/backend-test-utils'; -import { InstalledPackages } from '@n8n/db'; -import { InstalledNodesRepository } from '@n8n/db'; -import { InstalledPackagesRepository } from '@n8n/db'; +import { InstalledPackages, InstalledNodesRepository, InstalledPackagesRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { NODE_PACKAGE_PREFIX } from '@/constants'; diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts index e4496e7394..4fb3f73499 100644 --- a/packages/cli/test/integration/shared/utils/index.ts +++ b/packages/cli/test/integration/shared/utils/index.ts @@ -135,7 +135,7 @@ export function getAuthToken(response: request.Response, authCookieName = AUTH_C const match = authCookie.match(new RegExp(`(^| )${authCookieName}=(?[^;]+)`)); - if (!match || !match.groups) return undefined; + if (!match?.groups) return undefined; return match.groups.token; } diff --git a/packages/cli/test/integration/shared/utils/test-command.ts b/packages/cli/test/integration/shared/utils/test-command.ts index ea8f1e1140..1a2c8dd576 100644 --- a/packages/cli/test/integration/shared/utils/test-command.ts +++ b/packages/cli/test/integration/shared/utils/test-command.ts @@ -1,5 +1,4 @@ -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { testDb, mockInstance } from '@n8n/backend-test-utils'; import type { CommandClass } from '@n8n/decorators'; import argvParser from 'yargs-parser'; diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts index 676189ac3a..f95091a722 100644 --- a/packages/cli/test/integration/shared/utils/test-server.ts +++ b/packages/cli/test/integration/shared/utils/test-server.ts @@ -1,10 +1,6 @@ -import { LicenseState } from '@n8n/backend-common'; -import { ModuleRegistry } from '@n8n/backend-common'; -import { mockInstance, mockLogger } from '@n8n/backend-test-utils'; -import { testModules } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import type { APIRequest } from '@n8n/db'; -import type { User } from '@n8n/db'; +import { LicenseState, ModuleRegistry } from '@n8n/backend-common'; +import { mockInstance, mockLogger, testModules, testDb } from '@n8n/backend-test-utils'; +import type { APIRequest, User } from '@n8n/db'; import { Container } from '@n8n/di'; import cookieParser from 'cookie-parser'; import express from 'express'; diff --git a/packages/cli/test/integration/shared/utils/users.ts b/packages/cli/test/integration/shared/utils/users.ts index 697bc6cc26..d2ed3025ec 100644 --- a/packages/cli/test/integration/shared/utils/users.ts +++ b/packages/cli/test/integration/shared/utils/users.ts @@ -1,5 +1,4 @@ -import type { User } from '@n8n/db'; -import type { PublicUser } from '@n8n/db'; +import type { User, PublicUser } from '@n8n/db'; export const validateUser = (user: PublicUser) => { expect(typeof user.id).toBe('string'); diff --git a/packages/cli/test/integration/test-run.repository.ee.test.ts b/packages/cli/test/integration/test-run.repository.ee.test.ts index cf7265fff0..8b078c0c54 100644 --- a/packages/cli/test/integration/test-run.repository.ee.test.ts +++ b/packages/cli/test/integration/test-run.repository.ee.test.ts @@ -1,5 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import { TestRunRepository } from '@n8n/db'; import type { IWorkflowDb, WorkflowEntity } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts index cb5951a0f6..f9caa4fe01 100644 --- a/packages/cli/test/integration/user.repository.test.ts +++ b/packages/cli/test/integration/user.repository.test.ts @@ -1,7 +1,5 @@ -import { randomEmail } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { ProjectRelationRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { randomEmail, testDb } from '@n8n/backend-test-utils'; +import { ProjectRelationRepository, UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { createAdmin, createMember, createOwner } from './shared/db/users'; diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index a07894ffc9..860345169c 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -1,15 +1,23 @@ -import { createTeamProject, getPersonalProject, linkUserToProject } from '@n8n/backend-test-utils'; -import { createWorkflow, getWorkflowById, shareWorkflowWithUsers } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + getPersonalProject, + linkUserToProject, + createWorkflow, + getWorkflowById, + shareWorkflowWithUsers, + randomCredentialPayload, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; -import { FolderRepository } from '@n8n/db'; -import { ProjectRelationRepository } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { SharedCredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { UserRepository } from '@n8n/db'; +import { + FolderRepository, + ProjectRelationRepository, + ProjectRepository, + SharedCredentialsRepository, + SharedWorkflowRepository, + UserRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts index 7de32d1db6..dff68754a8 100644 --- a/packages/cli/test/integration/webhooks.api.test.ts +++ b/packages/cli/test/integration/webhooks.api.test.ts @@ -1,11 +1,10 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { readFileSync } from 'fs'; import { mock } from 'jest-mock-extended'; -import type { INode, IWorkflowBase } from 'n8n-workflow'; import { + type INode, + type IWorkflowBase, NodeConnectionTypes, type INodeType, type INodeTypeDescription, diff --git a/packages/cli/test/integration/workflow-history-manager.test.ts b/packages/cli/test/integration/workflow-history-manager.test.ts index 9287ef61a1..26f23b3848 100644 --- a/packages/cli/test/integration/workflow-history-manager.test.ts +++ b/packages/cli/test/integration/workflow-history-manager.test.ts @@ -1,6 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; import { GlobalConfig } from '@n8n/config'; import { WorkflowHistoryRepository } from '@n8n/db'; import { Container } from '@n8n/di'; diff --git a/packages/cli/test/integration/workflow-history.api.test.ts b/packages/cli/test/integration/workflow-history.api.test.ts index 74eba97ca0..7e30d60840 100644 --- a/packages/cli/test/integration/workflow-history.api.test.ts +++ b/packages/cli/test/integration/workflow-history.api.test.ts @@ -1,5 +1,4 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { createOwner, createUser } from './shared/db/users'; diff --git a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts index 5573087238..00bc410880 100644 --- a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts +++ b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts @@ -1,7 +1,5 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { TagRepository } from '@n8n/db'; -import { WorkflowTagMappingRepository } from '@n8n/db'; +import { createWorkflow, testDb } from '@n8n/backend-test-utils'; +import { TagRepository, WorkflowTagMappingRepository } from '@n8n/db'; import { Container } from '@n8n/di'; describe('WorkflowTagMappingRepository', () => { diff --git a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts index e38a560892..0739084250 100644 --- a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts @@ -1,6 +1,5 @@ import { LicenseState } from '@n8n/backend-common'; -import { createWorkflow, shareWorkflowWithUsers } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; +import { createWorkflow, shareWorkflowWithUsers, testDb } from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts index a163b89e73..0d1be621bc 100644 --- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts @@ -1,9 +1,10 @@ -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import { CredentialsEntity } from '@n8n/db'; -import { CredentialsRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { testDb, mockInstance } from '@n8n/backend-test-utils'; +import { + CredentialsEntity, + CredentialsRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts index 175e2959a0..f71019dfa1 100644 --- a/packages/cli/test/integration/workflows/workflow.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.test.ts @@ -1,8 +1,5 @@ -import { createWorkflow } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import { createWorkflow, testDb, mockInstance } from '@n8n/backend-test-utils'; +import { SharedWorkflowRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; diff --git a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts index 575866a516..6180e13b33 100644 --- a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts @@ -1,7 +1,9 @@ -import { createTeamProject } from '@n8n/backend-test-utils'; -import { createWorkflowWithTrigger } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; +import { + createTeamProject, + createWorkflowWithTrigger, + testDb, + mockInstance, +} from '@n8n/backend-test-utils'; import type { User } from '@n8n/db'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts index 26b0a5e7c3..8ed11d94de 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts @@ -1,20 +1,22 @@ -import { createTeamProject, getPersonalProject, linkUserToProject } from '@n8n/backend-test-utils'; import { + createTeamProject, + getPersonalProject, + linkUserToProject, createWorkflow, getWorkflowSharing, shareWorkflowWithProjects, shareWorkflowWithUsers, + randomCredentialPayload, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { Project } from '@n8n/db'; -import type { User } from '@n8n/db'; -import type { WorkflowWithSharingsMetaDataAndCredentials } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { WorkflowHistoryRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import type { Project, User, WorkflowWithSharingsMetaDataAndCredentials } from '@n8n/db'; +import { + ProjectRepository, + WorkflowHistoryRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { ProjectRole } from '@n8n/permissions'; import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow'; @@ -33,8 +35,7 @@ import { } from '../shared/db/credentials'; import { createTag } from '../shared/db/tags'; import { createAdmin, createOwner, createUser, createUserShell } from '../shared/db/users'; -import type { SaveCredentialFunction } from '../shared/types'; -import type { SuperAgentTest } from '../shared/types'; +import type { SaveCredentialFunction, SuperAgentTest } from '../shared/types'; import * as utils from '../shared/utils/'; import { makeWorkflow } from '../shared/utils/'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index 327977e1ca..486b31f95e 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -1,19 +1,21 @@ -import { createTeamProject, getPersonalProject, linkUserToProject } from '@n8n/backend-test-utils'; import { + createTeamProject, + getPersonalProject, + linkUserToProject, createWorkflow, shareWorkflowWithProjects, shareWorkflowWithUsers, + randomCredentialPayload, + testDb, + mockInstance, } from '@n8n/backend-test-utils'; -import { randomCredentialPayload } from '@n8n/backend-test-utils'; -import { testDb } from '@n8n/backend-test-utils'; -import { mockInstance } from '@n8n/backend-test-utils'; -import type { User } from '@n8n/db'; -import type { ListQueryDb } from '@n8n/db'; -import type { WorkflowFolderUnionFull } from '@n8n/db'; -import { ProjectRepository } from '@n8n/db'; -import { WorkflowHistoryRepository } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@n8n/db'; +import type { User, ListQueryDb, WorkflowFolderUnionFull } from '@n8n/db'; +import { + ProjectRepository, + WorkflowHistoryRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import type { Scope } from '@n8n/permissions'; import { DateTime } from 'luxon'; diff --git a/packages/cli/test/shared/mock-objects.ts b/packages/cli/test/shared/mock-objects.ts index 9bd6447cd9..31c2c1d1da 100644 --- a/packages/cli/test/shared/mock-objects.ts +++ b/packages/cli/test/shared/mock-objects.ts @@ -4,9 +4,7 @@ import { randomName, uniqueId, } from '@n8n/backend-test-utils'; -import { CredentialsEntity } from '@n8n/db'; -import { Project } from '@n8n/db'; -import { User } from '@n8n/db'; +import { CredentialsEntity, Project, User } from '@n8n/db'; import { randomInt } from 'n8n-workflow'; export const mockCredential = (): CredentialsEntity =>