mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-23 11:44:06 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

test(core): Use license mocker in RBAC tests (no-changelog) (#7912)

Browse source 
## 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).
This commit is contained in:
Iván Ovejero 2023-12-04 13:56:48 +01:00 committed by GitHub
parent 4bd7ae29f7
commit 29e7a98f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/cli/test/integration/shared/license.ts
View file

@ -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]>,
);
}

3
packages/cli/test/integration/shared/types.ts
View file

@ -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 {

2
packages/cli/test/integration/shared/utils/testServer.ts
View file

@ -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,
});
}

14
packages/cli/test/integration/users.api.test.ts
View file

@ -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' },