fix tests by adding test credentials to the loaded ones

guillaumejacquart · guillaumejacquart · commit 37ab3eb1360c · 2025-11-24T16:39:26.000+01:00
diff --git a/packages/@n8n/backend-test-utils/src/random.ts b/packages/@n8n/backend-test-utils/src/random.ts
@@ -48,7 +48,7 @@ export const randomCredentialPayload = ({
 	isGlobal,
 }: { isManaged?: boolean; isGlobal?: boolean } = {}): CredentialPayload => ({
 	name: randomName(),
-	type: randomName(),
+	type: 'githubApi',
 	data: { accessToken: randomString(6, 16) },
 	isManaged,
 	isGlobal,
diff --git a/packages/cli/test/integration/access-control/built-in-roles.test.ts b/packages/cli/test/integration/access-control/built-in-roles.test.ts
@@ -60,6 +60,8 @@ describe('Built-in Role Matrix Testing', () => {
 			passwordReset: jest.fn(),
 		});
 
+		await utils.initCredentialsTypes();
+
 		// Create standard users
 		owner = await createOwner();
 		member1 = await createMember();
diff --git a/packages/cli/test/integration/access-control/cross-project-access.test.ts b/packages/cli/test/integration/access-control/cross-project-access.test.ts
@@ -63,6 +63,8 @@ describe('Cross-Project Access Control Tests', () => {
 			passwordReset: jest.fn(),
 		});
 
+		await utils.initCredentialsTypes();
+
 		// Create standard users
 		owner = await createOwner();
 		member1 = await createMember();
diff --git a/packages/cli/test/integration/access-control/custom-roles-functionality.test.ts b/packages/cli/test/integration/access-control/custom-roles-functionality.test.ts
@@ -67,6 +67,8 @@ describe('Custom Role Functionality Tests', () => {
 			passwordReset: jest.fn(),
 		});
 
+		await utils.initCredentialsTypes();
+
 		// Create standard users
 		owner = await createOwner();
 		member1 = await createMember();
diff --git a/packages/cli/test/integration/access-control/resource-access-matrix.test.ts b/packages/cli/test/integration/access-control/resource-access-matrix.test.ts
@@ -9,20 +9,19 @@ import {
 } from '@n8n/backend-test-utils';
 import type { Project, User, Role } from '@n8n/db';
 
+import { UserManagementMailer } from '@/user-management/email';
+
 import { createCustomRoleWithScopeSlugs, cleanupRolesAndScopes } from '../shared/db/roles';
 import { createOwner, createMember } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
 
-import { UserManagementMailer } from '@/user-management/email';
-
 const testServer = utils.setupTestServer({
 	endpointGroups: ['workflows', 'credentials'],
 	enabledFeatures: ['feat:sharing', 'feat:customRoles'],
 	quotas: {
 		'quota:maxTeamProjects': -1,
 	},
-	mockNodesAndCredentials: true,
 });
 
 // Foundation users and projects
@@ -65,6 +64,8 @@ describe('Resource Access Control Matrix Tests', () => {
 		ownerAgent = testServer.authAgentFor(owner);
 		testUserAgent = testServer.authAgentFor(testUser);
 
+		await utils.initCredentialsTypes();
+
 		// Create custom roles with specific scopes
 		workflowReadOnlyRole = await createCustomRoleWithScopeSlugs(
 			['workflow:read', 'workflow:list'],
diff --git a/packages/cli/test/integration/ai/ai.api.test.ts b/packages/cli/test/integration/ai/ai.api.test.ts
@@ -16,7 +16,7 @@ import { AiService } from '@/services/ai.service';
 
 import { createOwner } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
-import { setupTestServer } from '../shared/utils';
+import { initCredentialsTypes, setupTestServer } from '../shared/utils';
 
 const createAiCreditsResponse = {
 	apiKey: randomUUID(),
@@ -30,13 +30,17 @@ Container.set(
 	}),
 );
 
-const testServer = setupTestServer({ endpointGroups: ['ai'], mockNodesAndCredentials: true });
+const testServer = setupTestServer({ endpointGroups: ['ai'] });
 
 let owner: User;
 let ownerPersonalProject: Project;
 
 let authOwnerAgent: SuperAgentTest;
 
+beforeAll(async () => {
+	await initCredentialsTypes();
+});
+
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'CredentialsEntity']);
 
diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -42,7 +42,6 @@ const testServer = utils.setupTestServer({
 	quotas: {
 		'quota:maxTeamProjects': -1,
 	},
-	mockNodesAndCredentials: true,
 });
 
 let owner: User;
@@ -63,6 +62,8 @@ let projectRepository: ProjectRepository;
 
 beforeAll(async () => {
 	await Container.get(RoleCacheService).refreshCache();
+
+	await utils.initCredentialsTypes();
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -18,6 +18,11 @@ import { Credentials } from 'n8n-core';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { randomString } from 'n8n-workflow';
 
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
+import { CredentialsService } from '@/credentials/credentials.service';
+import { createCredentialsFromCredentialsEntity } from '@/credentials-helper';
+import { CredentialsTester } from '@/services/credentials-tester.service';
+
 import {
 	decryptCredentialData,
 	getCredentialById,
@@ -27,18 +32,12 @@ import {
 } from '../shared/db/credentials';
 import { createAdmin, createManyUsers, createMember, createOwner } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
-import { setupTestServer } from '../shared/utils';
-
-import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
-import { CredentialsService } from '@/credentials/credentials.service';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { CredentialsTester } from '@/services/credentials-tester.service';
+import { initCredentialsTypes, setupTestServer } from '../shared/utils';
 
 const { any } = expect;
 
 const testServer = setupTestServer({
 	endpointGroups: ['credentials'],
-	mockNodesAndCredentials: true,
 });
 
 let owner: User;
@@ -56,6 +55,10 @@ let authAdminAgent: SuperAgentTest;
 let projectRepository: ProjectRepository;
 let sharedCredentialsRepository: SharedCredentialsRepository;
 
+beforeAll(async () => {
+	await initCredentialsTypes();
+});
+
 beforeEach(async () => {
 	await testDb.truncate(['SharedCredentials', 'CredentialsEntity']);
 
@@ -796,7 +799,6 @@ describe('POST /credentials', () => {
 		const payload = randomCredentialPayload();
 
 		const response = await authMemberAgent.post('/credentials').send(payload);
-
 		expect(response.statusCode).toBe(200);
 
 		const { id, name, type, data: encryptedData, scopes } = response.body.data;
@@ -1308,19 +1310,13 @@ describe('PATCH /credentials/:id', () => {
 		const { id, data } = response.body.data;
 
 		expect(id).toBe(savedCredential.id);
-		// was overwritten
-		expect(data.accessToken).toBe(patchPayload.data.accessToken);
 		// was not overwritten
 		const dbCredential = await getCredentialById(savedCredential.id);
+		const unencryptedData = createCredentialsFromCredentialsEntity(dbCredential!);
+		expect(unencryptedData.getData().oauthTokenData).toEqual(credential.data.oauthTokenData);
 
-		// this is required to prevent redaction of oauthTokenData
-		jest
-			.spyOn(Container.get(LoadNodesAndCredentials), 'getCredential')
-			.mockImplementationOnce((_credentialType) => {
-				throw new Error('Should not be called');
-			});
-		const unencryptedData = Container.get(CredentialsService).decrypt(dbCredential!);
-		expect(unencryptedData.oauthTokenData).toEqual(credential.data.oauthTokenData);
+		// was overwritten
+		expect(unencryptedData.getData().accessToken).toBe(patchPayload.data.accessToken);
 	});
 
 	test('should fail with invalid inputs', async () => {
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -13,17 +13,17 @@ import { Container } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
 import type { INode } from 'n8n-workflow';
 
-import { createTag } from '../shared/db/tags';
-import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
-import type { SuperAgentTest } from '../shared/types';
-import * as utils from '../shared/utils/';
-
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { STARTING_NODES } from '@/constants';
 import { ExecutionService } from '@/executions/execution.service';
 import { ProjectService } from '@/services/project.service.ee';
 import { Telemetry } from '@/telemetry';
 
+import { createTag } from '../shared/db/tags';
+import { createMemberWithApiKey, createOwnerWithApiKey } from '../shared/db/users';
+import type { SuperAgentTest } from '../shared/types';
+import * as utils from '../shared/utils/';
+
 mockInstance(Telemetry);
 
 let ownerPersonalProject: Project;
@@ -34,9 +34,7 @@ let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 let activeWorkflowManager: ActiveWorkflowManager;
 
-const testServer = utils.setupTestServer({
-	endpointGroups: ['publicApi'],
-});
+const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 const license = testServer.license;
 
 const globalConfig = Container.get(GlobalConfig);
@@ -452,12 +450,11 @@ describe('GET /workflows', () => {
 		}
 	});
 
-	test('should return activeVersion for all workflows', async () => {
+	test.only('should return activeVersion for all workflows', async () => {
 		const inactiveWorkflow = await createWorkflow({}, member);
 		const activeWorkflow = await createWorkflowWithTriggerAndHistory({}, member);
 
-		const test = await authMemberAgent.post(`/workflows/${activeWorkflow.id}/activate`);
-		console.log(test.body);
+		await authMemberAgent.post(`/workflows/${activeWorkflow.id}/activate`);
 
 		const response = await authMemberAgent.get('/workflows');
 
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
@@ -12,6 +12,9 @@ import {
 } from 'n8n-core';
 import { Ftp } from 'n8n-nodes-base/credentials/Ftp.credentials';
 import { GithubApi } from 'n8n-nodes-base/credentials/GithubApi.credentials';
+import { HttpBasicAuth } from 'n8n-nodes-base/credentials/HttpBasicAuth.credentials';
+import { HttpHeaderAuth } from 'n8n-nodes-base/credentials/HttpHeaderAuth.credentials';
+import { OpenAiApi } from 'n8n-nodes-base/credentials/OpenAiApi.credentials';
 import { Cron } from 'n8n-nodes-base/nodes/Cron/Cron.node';
 import { FormTrigger } from 'n8n-nodes-base/nodes/Form/FormTrigger.node';
 import { ScheduleTrigger } from 'n8n-nodes-base/nodes/Schedule/ScheduleTrigger.node';
@@ -63,6 +66,18 @@ export async function initCredentialsTypes(): Promise<void> {
 			type: new Ftp(),
 			sourcePath: '',
 		},
+		openAiApi: {
+			type: new OpenAiApi(),
+			sourcePath: '',
+		},
+		httpHeaderAuth: {
+			type: new HttpHeaderAuth(),
+			sourcePath: '',
+		},
+		httpBasicAuth: {
+			type: new HttpBasicAuth(),
+			sourcePath: '',
+		},
 	};
 }
 
diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts
@@ -3,26 +3,25 @@ import { mockInstance, mockLogger, testModules, testDb } from '@n8n/backend-test
 import { GlobalConfig } from '@n8n/config';
 import type { APIRequest, User } from '@n8n/db';
 import { Container } from '@n8n/di';
-import { LicenseMocker } from '@test-integration/license';
 import cookieParser from 'cookie-parser';
 import express from 'express';
 import type superagent from 'superagent';
 import request from 'supertest';
 import { URL } from 'url';
 
-import { PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
-import type { SetupProps, TestServer } from '../types';
-
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { ControllerRegistry } from '@/controller.registry';
 import { License } from '@/license';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { rawBodyReader, bodyParser } from '@/middlewares';
 import { PostHogClient } from '@/posthog';
 import { Push } from '@/push';
 import { Telemetry } from '@/telemetry';
+import { LicenseMocker } from '@test-integration/license';
+
+import { PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
+import type { SetupProps, TestServer } from '../types';
 
 /**
  * Plugin to prefix a path segment into a request URL pathname.
@@ -96,7 +95,6 @@ export const setupTestServer = ({
 	enabledFeatures,
 	quotas,
 	modules,
-	mockNodesAndCredentials = false,
 }: SetupProps): TestServer => {
 	const app = express();
 	app.use(rawBodyReader);
@@ -113,24 +111,6 @@ export const setupTestServer = ({
 	mockInstance(Push);
 	mockInstance(Telemetry);
 
-	// Mock LoadNodesAndCredentials BEFORE setupTestServer is called
-	// Used by the credential service on credential creation to check required parameters
-	if (mockNodesAndCredentials) {
-		mockInstance(LoadNodesAndCredentials, {
-			getCredential(_credentialType) {
-				return {
-					sourcePath: '',
-					type: {
-						name: 'MyTestCredential',
-						displayName: 'My Test Credential',
-						properties: [],
-						extends: [],
-					},
-				};
-			},
-		});
-	}
-
 	const testServer: TestServer = {
 		app,
 		httpServer: app.listen(0),
