admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-21 20:00:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "chore(core): Use roles from database in global roles (#17853)" (#18738)

Browse Source
This commit is contained in:
Andreas Fitzek
2025-08-25 14:29:28 +02:00
committed by GitHub
parent b62c957c71
commit a21a03d4b0
117 changed files with 410 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/cli/test/integration/environments/source-control.api.test.ts
View File

@@ -1,6 +1,6 @@
import type { SourceControlledFile } from '@n8n/api-types';
import { mockInstance } from '@n8n/backend-test-utils';
import { GLOBAL_OWNER_ROLE, type User } from '@n8n/db';
import type { User } from '@n8n/db';
import { Container } from '@n8n/di';
import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
@@ -24,7 +24,7 @@ const testServer = utils.setupTestServer({
let sourceControlPreferencesService: SourceControlPreferencesService;
beforeAll(async () => {
owner = await createUser({ role: GLOBAL_OWNER_ROLE });
owner = await createUser({ role: 'global:owner' });
authOwnerAgent = testServer.authAgentFor(owner);
sourceControlPreferencesService = Container.get(SourceControlPreferencesService);

11
packages/cli/test/integration/environments/source-control.service.test.ts
View File

@@ -4,9 +4,6 @@ import {
CredentialsEntity,
type Folder,
FolderRepository,
GLOBAL_ADMIN_ROLE,
GLOBAL_MEMBER_ROLE,
GLOBAL_OWNER_ROLE,
Project,
type TagEntity,
TagRepository,
@@ -220,10 +217,10 @@ describe('SourceControlService', () => {
*/
[globalAdmin, globalOwner, globalMember, projectAdmin] = await Promise.all([
await createUser({ role: GLOBAL_ADMIN_ROLE }),
await createUser({ role: GLOBAL_OWNER_ROLE }),
await createUser({ role: GLOBAL_MEMBER_ROLE }),
await createUser({ role: GLOBAL_MEMBER_ROLE }),
await createUser({ role: 'global:admin' }),
await createUser({ role: 'global:owner' }),
await createUser({ role: 'global:member' }),
await createUser({ role: 'global:member' }),
]);
[projectA, projectB] = await Promise.all([