From 29e7a98f3e966295806f5ef9f1452a3939ca70f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 4 Dec 2023 13:56:48 +0100 Subject: [PATCH] test(core): Use license mocker in RBAC tests (no-changelog) (#7912) ## Summary Provide details about your pull request and what it adds, fixes, or changes. Photos and videos are recommended. ... #### How to test the change: 1. ... ## Issues fixed Include links to Github issue or Community forum post or **Linear ticket**: > Important in order to close automatically and provide context to reviewers ... ## Review / Merge checklist - [ ] PR title and summary are descriptive. **Remember, the title automatically goes into the changelog. Use `(no-changelog)` otherwise.** ([conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md)) - [ ] [Docs updated](https://github.com/n8n-io/n8n-docs) or follow-up ticket created. - [ ] Tests included. > A bug is not considered fixed, unless a test is added to prevent it from happening again. A feature is not complete without tests. > > *(internal)* You can use Slack commands to trigger [e2e tests](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#a39f9e5ba64a48b58a71d81c837e8227) or [deploy test instance](https://www.notion.so/n8n/How-to-use-Test-Instances-d65f49dfc51f441ea44367fb6f67eb0a?pvs=4#f6a177d32bde4b57ae2da0b8e454bfce) or [deploy early access version on Cloud](https://www.notion.so/n8n/Cloudbot-3dbe779836004972b7057bc989526998?pvs=4#fef2d36ab02247e1a0f65a74f6fb534e). --- packages/cli/test/integration/shared/license.ts | 4 ++-- packages/cli/test/integration/shared/types.ts | 3 ++- .../test/integration/shared/utils/testServer.ts | 2 ++ packages/cli/test/integration/users.api.test.ts | 14 +++++--------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/cli/test/integration/shared/license.ts b/packages/cli/test/integration/shared/license.ts index a343879afe..3f9e736153 100644 --- a/packages/cli/test/integration/shared/license.ts +++ b/packages/cli/test/integration/shared/license.ts @@ -3,7 +3,7 @@ import type { License } from '@/License'; export interface LicenseMockDefaults { features?: BooleanLicenseFeature[]; - quota?: Partial<{ [K in NumericLicenseFeature]: number }>; + quotas?: Partial<{ [K in NumericLicenseFeature]: number }>; } export class LicenseMocker { @@ -28,7 +28,7 @@ export class LicenseMocker { setDefaults(defaults: LicenseMockDefaults) { this._defaultFeatures = new Set(defaults.features ?? []); this._defaultQuotas = new Map( - Object.entries(defaults.quota ?? {}) as Array<[NumericLicenseFeature, number]>, + Object.entries(defaults.quotas ?? {}) as Array<[NumericLicenseFeature, number]>, ); } diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts index a92991ffa2..ff93f11632 100644 --- a/packages/cli/test/integration/shared/types.ts +++ b/packages/cli/test/integration/shared/types.ts @@ -5,7 +5,7 @@ import type { Server } from 'http'; import type { CredentialsEntity } from '@db/entities/CredentialsEntity'; import type { User } from '@db/entities/User'; -import type { BooleanLicenseFeature, ICredentialsDb } from '@/Interfaces'; +import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/Interfaces'; import type { LicenseMocker } from './license'; type EndpointGroup = @@ -38,6 +38,7 @@ export interface SetupProps { applyAuth?: boolean; endpointGroups?: EndpointGroup[]; enabledFeatures?: BooleanLicenseFeature[]; + quotas?: Partial<{ [K in NumericLicenseFeature]: number }>; } export interface TestServer { diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts index 3f250af23f..0de66cedab 100644 --- a/packages/cli/test/integration/shared/utils/testServer.ts +++ b/packages/cli/test/integration/shared/utils/testServer.ts @@ -68,6 +68,7 @@ export const setupTestServer = ({ endpointGroups, applyAuth = true, enabledFeatures, + quotas, }: SetupProps): TestServer => { const app = express(); app.use(rawBodyReader); @@ -97,6 +98,7 @@ export const setupTestServer = ({ if (enabledFeatures) { testServer.license.setDefaults({ features: enabledFeatures, + quotas, }); } diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index a6a05481e0..4e18f13d85 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -18,14 +18,10 @@ import * as testDb from './shared/testDb'; import type { SuperAgentTest } from 'supertest'; import type { Role } from '@db/entities/Role'; import type { User } from '@db/entities/User'; -import { License } from '@/License'; -import { mockInstance } from '../shared/mocking'; -const testServer = utils.setupTestServer({ endpointGroups: ['users'] }); - -const license = mockInstance(License, { - isAdvancedPermissionsLicensed: jest.fn().mockReturnValue(true), - isWithinUsersLimit: jest.fn().mockReturnValue(true), +const testServer = utils.setupTestServer({ + endpointGroups: ['users'], + enabledFeatures: ['feat:advancedPermissions'], }); describe('GET /users', () => { @@ -528,7 +524,7 @@ describe('PATCH /users/:id/role', () => { }); test('should fail to promote member to admin if not licensed', async () => { - license.isAdvancedPermissionsLicensed.mockReturnValueOnce(false); + testServer.license.disable('feat:advancedPermissions'); const response = await adminAgent.patch(`/users/${member.id}/role`).send({ newRole: { scope: 'global', name: 'admin' }, @@ -634,7 +630,7 @@ describe('PATCH /users/:id/role', () => { }); test('should fail to promote member to admin if not licensed', async () => { - license.isAdvancedPermissionsLicensed.mockReturnValueOnce(false); + testServer.license.disable('feat:advancedPermissions'); const response = await ownerAgent.patch(`/users/${member.id}/role`).send({ newRole: { scope: 'global', name: 'admin' },