Skip to content

Commit a14b496

Browse files
Merge branch 'develop' into feat/openapi-chat-pinMessage
2 parents beb5ea5 + 74a162e commit a14b496

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

ee/packages/license/__tests__/emitter.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Event License behaviors', () => {
1616
const mocked = await new MockedLicenseBuilder();
1717
const oldToken = await mocked.sign();
1818

19-
const newToken = await mocked.withGratedModules(['livechat-enterprise']).sign();
19+
const newToken = await mocked.withGrantedModules(['livechat-enterprise']).sign();
2020

2121
// apply license
2222
await expect(license.setLicense(oldToken)).resolves.toBe(true);

ee/packages/license/__tests__/setLicense.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ describe('License set license procedures', () => {
140140
const mocked = new MockedLicenseBuilder();
141141
const oldToken = await mocked.sign();
142142

143-
const newToken = await mocked.withGratedModules(['livechat-enterprise', 'chat.rocket.test-addon']).sign();
143+
const newToken = await mocked.withGrantedModules(['livechat-enterprise', 'chat.rocket.test-addon']).sign();
144144

145145
await expect(license.setLicense(oldToken)).resolves.toBe(true);
146146
expect(license.hasValidLicense()).toBe(true);

ee/packages/license/src/MockedLicenseBuilder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,15 @@ export class MockedLicenseBuilder {
198198
return this;
199199
}
200200

201-
public withGratedModules(modules: LicenseModule[]): this {
201+
public withGrantedModules(modules: LicenseModule[]): this {
202202
this.grantedModules = this.grantedModules ?? [];
203203
this.grantedModules.push(
204204
...(modules.map((module) => ({ module, external: !CoreModules.includes(module as InternalModuleName) })) as GrantedModules),
205205
);
206206
return this;
207207
}
208208

209-
withNoGratedModules(modules: LicenseModule[]): this {
209+
withNoGrantedModules(modules: LicenseModule[]): this {
210210
this.grantedModules = this.grantedModules ?? [];
211211
this.grantedModules = this.grantedModules.filter(({ module }) => !modules.includes(module));
212212
return this;

ee/packages/license/src/license.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ describe('License.setLicense', () => {
334334
licenseManager.on('sync', syncCallback);
335335
licenseManager.on('module', moduleCallback);
336336

337-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing']);
337+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing']);
338338

339339
await expect(licenseManager.setLicense(await license.sign())).resolves.toBe(true);
340340

@@ -354,7 +354,7 @@ describe('License.setLicense', () => {
354354
licenseManager.on('sync', syncCallback);
355355
licenseManager.on('module', moduleCallback);
356356

357-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing']).withLimits('activeUsers', [
357+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing']).withLimits('activeUsers', [
358358
{
359359
max: 10,
360360
behavior: 'disable_modules',
@@ -393,7 +393,7 @@ describe('License.setLicense', () => {
393393
licenseManager.on('sync', syncCallback);
394394
licenseManager.on('module', moduleCallback);
395395

396-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing']).withLimits('activeUsers', [
396+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing']).withLimits('activeUsers', [
397397
{
398398
max: 10,
399399
behavior: 'disable_modules',
@@ -431,7 +431,7 @@ describe('License.removeLicense', () => {
431431

432432
licenseManager.onModule(moduleCallback);
433433

434-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).withLimits('activeUsers', [
434+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).withLimits('activeUsers', [
435435
{
436436
max: 10,
437437
behavior: 'disable_modules',

ee/packages/license/src/modules.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('getModules', () => {
88

99
const modules = ['auditing', 'livechat-enterprise', 'ldap-enterprise', 'chat.rocket.test-addon'] as LicenseModule[];
1010

11-
const license = await new MockedLicenseBuilder().withGratedModules(modules).sign();
11+
const license = await new MockedLicenseBuilder().withGrantedModules(modules).sign();
1212

1313
await expect(licenseManager.setLicense(license)).resolves.toBe(true);
1414

@@ -23,7 +23,7 @@ describe('getModuleDefinition', () => {
2323
it('should not return `external` property for an internal module', async () => {
2424
const licenseManager = await getReadyLicenseManager();
2525

26-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).sign();
26+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).sign();
2727

2828
await licenseManager.setLicense(license);
2929

@@ -35,7 +35,7 @@ describe('getModuleDefinition', () => {
3535
it('should return `undefined` for a non-existing module', async () => {
3636
const licenseManager = await getReadyLicenseManager();
3737

38-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).sign();
38+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).sign();
3939

4040
await licenseManager.setLicense(license);
4141

@@ -55,7 +55,7 @@ describe('getModuleDefinition', () => {
5555
it('should return `external` property for an external module', async () => {
5656
const licenseManager = await getReadyLicenseManager();
5757

58-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).sign();
58+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).sign();
5959

6060
await licenseManager.setLicense(license);
6161

@@ -69,7 +69,7 @@ describe('getExternalModules', () => {
6969
it('should return only external modules', async () => {
7070
const licenseManager = await getReadyLicenseManager();
7171

72-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).sign();
72+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).sign();
7373

7474
await licenseManager.setLicense(license);
7575

@@ -82,7 +82,7 @@ describe('getExternalModules', () => {
8282
it('should return empty array if no external module is present', async () => {
8383
const licenseManager = await getReadyLicenseManager();
8484

85-
const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'livechat-enterprise']).sign();
85+
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'livechat-enterprise']).sign();
8686

8787
await licenseManager.setLicense(license);
8888

0 commit comments

Comments
 (0)