From fcda46eafc3346756adcb1c67e145859380fd451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 12 Jun 2024 12:45:05 +0200 Subject: [PATCH] Fix tests --- packages/cli/test/integration/commands/ldap/reset.test.ts | 3 +++ .../cli/test/integration/environments/SourceControl.test.ts | 3 +++ packages/cli/test/integration/publicApi/executions.test.ts | 4 ++++ packages/cli/test/integration/publicApi/workflows.test.ts | 3 +++ packages/cli/test/integration/users.api.test.ts | 2 ++ packages/cli/test/integration/webhooks.api.test.ts | 3 +++ ...rkflows.controller-with-active-workflow-manager.ee.test.ts | 4 ++++ packages/cli/test/unit/WorkflowRunner.test.ts | 4 ++++ 8 files changed, 26 insertions(+) diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index 9a0ebecd516c2..24efed477c0dd 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -21,6 +21,9 @@ import { getLdapSynchronizations, saveLdapSynchronization } from '@/Ldap/helpers import { createLdapConfig } from '../../shared/ldap'; import { LdapService } from '@/Ldap/ldap.service'; import { v4 as uuid } from 'uuid'; +import { Telemetry } from '@/telemetry'; + +mockInstance(Telemetry); const oclifConfig = new Config({ root: __dirname }); diff --git a/packages/cli/test/integration/environments/SourceControl.test.ts b/packages/cli/test/integration/environments/SourceControl.test.ts index c64981c096612..cac369422b772 100644 --- a/packages/cli/test/integration/environments/SourceControl.test.ts +++ b/packages/cli/test/integration/environments/SourceControl.test.ts @@ -9,9 +9,12 @@ import type { SourceControlledFile } from '@/environments/sourceControl/types/so import * as utils from '../shared/utils/'; import { createUser } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; +import { mockInstance } from '@test/mocking'; +import { Telemetry } from '@/telemetry'; let authOwnerAgent: SuperAgentTest; let owner: User; +mockInstance(Telemetry); const testServer = utils.setupTestServer({ endpointGroups: ['sourceControl', 'license', 'auth'], diff --git a/packages/cli/test/integration/publicApi/executions.test.ts b/packages/cli/test/integration/publicApi/executions.test.ts index ce26a19f8fa8f..d6db284c072ca 100644 --- a/packages/cli/test/integration/publicApi/executions.test.ts +++ b/packages/cli/test/integration/publicApi/executions.test.ts @@ -17,6 +17,8 @@ import { createWaitingExecution, } from '../shared/db/executions'; import type { SuperAgentTest } from '../shared/types'; +import { mockInstance } from '@test/mocking'; +import { Telemetry } from '@/telemetry'; let owner: User; let user1: User; @@ -26,6 +28,8 @@ let authUser1Agent: SuperAgentTest; let authUser2Agent: SuperAgentTest; let workflowRunner: ActiveWorkflowManager; +mockInstance(Telemetry); + const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] }); beforeAll(async () => { diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts index eb4a7f461af94..10737a30f0b12 100644 --- a/packages/cli/test/integration/publicApi/workflows.test.ts +++ b/packages/cli/test/integration/publicApi/workflows.test.ts @@ -20,6 +20,9 @@ import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflow import { createTag } from '../shared/db/tags'; import { mockInstance } from '../../shared/mocking'; import type { SuperAgentTest } from '../shared/types'; +import { Telemetry } from '@/telemetry'; + +mockInstance(Telemetry); let owner: User; let ownerPersonalProject: Project; diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index 9e968caca4df6..26183cba392a9 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -27,7 +27,9 @@ import * as testDb from './shared/testDb'; import { mockInstance } from '../shared/mocking'; import type { SuperAgentTest } from './shared/types'; import { createTeamProject, getPersonalProject, linkUserToProject } from './shared/db/projects'; +import { Telemetry } from '@/telemetry'; +mockInstance(Telemetry); mockInstance(ExecutionService); const testServer = utils.setupTestServer({ diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts index 4858d1f7b410c..64cb760c8ec69 100644 --- a/packages/cli/test/integration/webhooks.api.test.ts +++ b/packages/cli/test/integration/webhooks.api.test.ts @@ -15,6 +15,9 @@ import * as testDb from './shared/testDb'; import { createUser } from './shared/db/users'; import { createWorkflow } from './shared/db/workflows'; import type { SuperAgentTest } from './shared/types'; +import { Telemetry } from '@/telemetry'; + +mockInstance(Telemetry); describe('Webhook API', () => { mockInstance(ExternalHooks); 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 42f3a49e06197..607639b091a12 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 @@ -5,6 +5,10 @@ import * as testDb from '../shared/testDb'; import { createUser } from '../shared/db/users'; import { createWorkflowWithTrigger } from '../shared/db/workflows'; import { createTeamProject } from '../shared/db/projects'; +import { mockInstance } from '@test/mocking'; +import { Telemetry } from '@/telemetry'; + +mockInstance(Telemetry); let member: User; let anotherMember: User; diff --git a/packages/cli/test/unit/WorkflowRunner.test.ts b/packages/cli/test/unit/WorkflowRunner.test.ts index 72f3da9fd2d98..c972d6bb73933 100644 --- a/packages/cli/test/unit/WorkflowRunner.test.ts +++ b/packages/cli/test/unit/WorkflowRunner.test.ts @@ -9,12 +9,16 @@ import { setupTestServer } from '../integration/shared/utils'; import { createUser } from '../integration/shared/db/users'; import { createWorkflow } from '../integration/shared/db/workflows'; import { createExecution } from '../integration/shared/db/executions'; +import { mockInstance } from '@test/mocking'; +import { Telemetry } from '@/telemetry'; let owner: User; let runner: WorkflowRunner; let hookFunctions: IWorkflowExecuteHooks; setupTestServer({ endpointGroups: [] }); +mockInstance(Telemetry); + class Watchers { workflowExecuteAfter = jest.fn(); }