Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ee/packages/license/__tests__/emitter.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Event License behaviors', () => {
const mocked = await new MockedLicenseBuilder();
const oldToken = await mocked.sign();

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

// apply license
await expect(license.setLicense(oldToken)).resolves.toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/license/__tests__/setLicense.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ describe('License set license procedures', () => {
const mocked = new MockedLicenseBuilder();
const oldToken = await mocked.sign();

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

await expect(license.setLicense(oldToken)).resolves.toBe(true);
expect(license.hasValidLicense()).toBe(true);
Expand Down
4 changes: 2 additions & 2 deletions ee/packages/license/src/MockedLicenseBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@ export class MockedLicenseBuilder {
return this;
}

public withGratedModules(modules: LicenseModule[]): this {
public withGrantedModules(modules: LicenseModule[]): this {
this.grantedModules = this.grantedModules ?? [];
this.grantedModules.push(
...(modules.map((module) => ({ module, external: !CoreModules.includes(module as InternalModuleName) })) as GrantedModules),
);
return this;
}

withNoGratedModules(modules: LicenseModule[]): this {
withNoGrantedModules(modules: LicenseModule[]): this {
this.grantedModules = this.grantedModules ?? [];
this.grantedModules = this.grantedModules.filter(({ module }) => !modules.includes(module));
return this;
Expand Down
8 changes: 4 additions & 4 deletions ee/packages/license/src/license.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ describe('License.setLicense', () => {
licenseManager.on('sync', syncCallback);
licenseManager.on('module', moduleCallback);

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

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

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

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

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

licenseManager.onModule(moduleCallback);

const license = await new MockedLicenseBuilder().withGratedModules(['auditing', 'chat.rocket.test-addon']).withLimits('activeUsers', [
const license = await new MockedLicenseBuilder().withGrantedModules(['auditing', 'chat.rocket.test-addon']).withLimits('activeUsers', [
{
max: 10,
behavior: 'disable_modules',
Expand Down
12 changes: 6 additions & 6 deletions ee/packages/license/src/modules.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('getModules', () => {

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

const license = await new MockedLicenseBuilder().withGratedModules(modules).sign();
const license = await new MockedLicenseBuilder().withGrantedModules(modules).sign();

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

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

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

await licenseManager.setLicense(license);

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

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

await licenseManager.setLicense(license);

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

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

await licenseManager.setLicense(license);

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

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

await licenseManager.setLicense(license);

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

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

await licenseManager.setLicense(license);

Expand Down
Loading