regression: validateLicenseLimits not using the expected limit (#30693)

RocketChat · Oct 20, 2023 · a3b3dea · a3b3dea
1 parent 53cf1f5
commit a3b3dea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ee/packages/license/src/license.spec.ts b/ee/packages/license/src/license.spec.ts
@@ -41,7 +41,7 @@ it('should prevent if the counter is equal or over the limit', async () => {
 	await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true);
 });
 
-it.skip('should not prevent an action if another limit is over the limit', async () => {
+it('should not prevent an action if another limit is over the limit', async () => {
 	const licenseManager = await getReadyLicenseManager();
 
 	const license = await new MockedLicenseBuilder()
@@ -63,6 +63,7 @@ it.skip('should not prevent an action if another limit is over the limit', async
 	licenseManager.setLicenseLimitCounter('activeUsers', () => 11);
 	licenseManager.setLicenseLimitCounter('monthlyActiveContacts', () => 2);
 	await expect(licenseManager.shouldPreventAction('monthlyActiveContacts')).resolves.toBe(false);
+	await expect(licenseManager.shouldPreventAction('activeUsers')).resolves.toBe(true);
 });
 
 describe('Validate License Limits', () => {

diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
@@ -268,6 +268,7 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 			...(extraCount && { behaviors: ['prevent_action'] }),
 			isNewLicense: false,
 			suppressLog: !!suppressLog,
+			limits: [action],
 			context: {
 				[action]: {
 					extraCount,