test(core): Fix typing issues in tests (no-changelog) (#10244)

This commit is contained in:
Tomi Turtiainen
2024-07-30 21:24:01 +03:00
committed by GitHub
parent 5b47c8b57b
commit 3d23f2f333
18 changed files with 41 additions and 38 deletions

View File

@@ -200,7 +200,7 @@ test('should anonymize audit message to syslog ', async () => {
'message',
async function handler005(msg: { command: string; data: any }) {
if (msg.command === 'appendMessageToLog') {
const sent = await eventBus.getEventsAll();
await eventBus.getEventsAll();
await confirmIdInAll(testAuditMessage.id);
expect(mockedSyslogClientLog).toHaveBeenCalled();
eventBus.logWriter.worker?.removeListener('message', handler005);
@@ -217,7 +217,7 @@ test('should anonymize audit message to syslog ', async () => {
'message',
async function handler006(msg: { command: string; data: any }) {
if (msg.command === 'appendMessageToLog') {
const sent = await eventBus.getEventsAll();
await eventBus.getEventsAll();
await confirmIdInAll(testAuditMessage.id);
expect(mockedSyslogClientLog).toHaveBeenCalled();
syslogDestination.disable();

View File

@@ -12,7 +12,10 @@ import { WaitTracker } from '@/WaitTracker';
import { createTeamProject, linkUserToProject } from './shared/db/projects';
mockInstance(WaitTracker);
mockInstance(ConcurrencyControlService, { isEnabled: false });
mockInstance(ConcurrencyControlService, {
// @ts-expect-error Private property
isEnabled: false,
});
const testServer = setupTestServer({ endpointGroups: ['executions'] });

View File

@@ -31,7 +31,6 @@ describe('ProjectService', () => {
describe('when user has roles in projects where workflow is accessible', () => {
it('should return roles and project IDs', async () => {
const user = await createUser();
const secondUser = await createUser(); // @TODO: Needed only to satisfy index in legacy column
const firstProject = await createTeamProject('Project 1');
const secondProject = await createTeamProject('Project 2');
@@ -42,17 +41,15 @@ describe('ProjectService', () => {
const workflow = await createWorkflow();
await sharedWorkflowRepository.insert({
userId: user.id, // @TODO: Legacy column
projectId: firstProject.id,
workflowId: workflow.id,
role: 'workflow:owner',
});
await sharedWorkflowRepository.insert({
userId: secondUser.id, // @TODO: Legacy column
projectId: secondProject.id,
workflowId: workflow.id,
role: 'workflow:user',
role: 'workflow:owner',
});
const projectIds = await projectService.findProjectsWorkflowIsIn(workflow.id);
@@ -63,9 +60,6 @@ describe('ProjectService', () => {
describe('when user has no roles in projects where workflow is accessible', () => {
it('should return project IDs but no roles', async () => {
const user = await createUser();
const secondUser = await createUser(); // @TODO: Needed only to satisfy index in legacy column
const firstProject = await createTeamProject('Project 1');
const secondProject = await createTeamProject('Project 2');
@@ -74,17 +68,15 @@ describe('ProjectService', () => {
const workflow = await createWorkflow();
await sharedWorkflowRepository.insert({
userId: user.id, // @TODO: Legacy column
projectId: firstProject.id,
workflowId: workflow.id,
role: 'workflow:owner',
});
await sharedWorkflowRepository.insert({
userId: secondUser.id, // @TODO: Legacy column
projectId: secondProject.id,
workflowId: workflow.id,
role: 'workflow:user',
role: 'workflow:owner',
});
const projectIds = await projectService.findProjectsWorkflowIsIn(workflow.id);

View File

@@ -98,7 +98,6 @@ describe('softDeleteOnPruningCycle()', () => {
});
test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
['warning', { startedAt: now, stoppedAt: now }],
['unknown', { startedAt: now, stoppedAt: now }],
['canceled', { startedAt: now, stoppedAt: now }],
['crashed', { startedAt: now, stoppedAt: now }],
@@ -191,7 +190,6 @@ describe('softDeleteOnPruningCycle()', () => {
});
test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
['warning', { startedAt: yesterday, stoppedAt: yesterday }],
['unknown', { startedAt: yesterday, stoppedAt: yesterday }],
['canceled', { startedAt: yesterday, stoppedAt: yesterday }],
['crashed', { startedAt: yesterday, stoppedAt: yesterday }],

View File

@@ -14,6 +14,7 @@ import config from '@/config';
import { generateNanoId } from '@db/utils/generators';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import Container from 'typedi';
import { NodeConnectionType } from 'n8n-workflow';
let securityAuditService: SecurityAuditService;
@@ -156,7 +157,7 @@ test('should not report webhooks validated by direct children', async () => {
[
{
node: 'My Node',
type: 'main',
type: NodeConnectionType.Main,
index: 0,
},
],

View File

@@ -9,6 +9,7 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { Project } from '@/databases/entities/Project';
import { NodeConnectionType } from 'n8n-workflow';
export async function createManyWorkflows(
amount: number,
@@ -157,7 +158,7 @@ export async function createWorkflowWithTrigger(
position: [780, 300],
},
],
connections: { Cron: { main: [[{ node: 'Set', type: 'main', index: 0 }]] } },
connections: { Cron: { main: [[{ node: 'Set', type: NodeConnectionType.Main, index: 0 }]] } },
...attributes,
},
user,

View File

@@ -96,9 +96,10 @@ export async function initBinaryDataService(mode: 'default' | 'filesystem' = 'de
* Extract the value (token) of the auth cookie in a response.
*/
export function getAuthToken(response: request.Response, authCookieName = AUTH_COOKIE_NAME) {
const cookies: string[] = response.headers['set-cookie'];
const cookiesHeader = response.headers['set-cookie'];
if (!cookiesHeader) return undefined;
if (!cookies) return undefined;
const cookies = Array.isArray(cookiesHeader) ? cookiesHeader : [cookiesHeader];
const authCookie = cookies.find((c) => c.startsWith(`${authCookieName}=`));

View File

@@ -30,6 +30,8 @@ describe('EnterpriseWorkflowService', () => {
Container.get(CredentialsRepository),
mock(),
mock(),
mock(),
mock(),
);
});

View File

@@ -11,7 +11,6 @@ import { Telemetry } from '@/telemetry';
mockInstance(Telemetry);
let member: User;
let anotherMember: User;
const testServer = utils.setupTestServer({
endpointGroups: ['workflows'],
@@ -20,7 +19,6 @@ const testServer = utils.setupTestServer({
beforeAll(async () => {
member = await createUser({ role: 'global:member' });
anotherMember = await createUser({ role: 'global:member' });
await utils.initNodeTypes();
});