forked from ngworker/lumberjack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat+fix: add guards to LumberjackModule and prevent failure if no lo…
…g drivers are registered (ngworker#19) * chore: lock dependencies * test: cover LumberjackModule * feat: add guards to LumberjackModule to prevent accidental misuse * fix: don't fail if no log drivers are registered * test: fix flaky tests
- Loading branch information
Showing
9 changed files
with
288 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
projects/ngworker/lumberjack/src/lib/lumberjack-root.module.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { LumberjackRootModule } from './lumberjack-root.module'; | ||
|
||
describe(LumberjackRootModule.name, () => { | ||
it('guards against being registered in multiple injectors', () => { | ||
const rootInjectorInstance = new LumberjackRootModule(); | ||
|
||
expect(() => new LumberjackRootModule(rootInjectorInstance)).toThrowError(/multiple injectors/); | ||
}); | ||
}); |
21 changes: 21 additions & 0 deletions
21
projects/ngworker/lumberjack/src/lib/lumberjack-root.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import { NgModule, Optional, SkipSelf } from '@angular/core'; | ||
|
||
import { defaultLogDriverConfig, LogDriverConfigToken } from './configs/log-driver.config'; | ||
|
||
@NgModule({ | ||
providers: [ | ||
{ | ||
provide: LogDriverConfigToken, | ||
useValue: defaultLogDriverConfig, | ||
}, | ||
], | ||
}) | ||
export class LumberjackRootModule { | ||
constructor(@Optional() @SkipSelf() maybeNgModuleFromParentInjector?: LumberjackRootModule) { | ||
if (maybeNgModuleFromParentInjector) { | ||
throw new Error( | ||
'LumberjackModule.forRoot registered in multiple injectors. Only call it from your root injector such as in AppModule.' | ||
); | ||
} | ||
} | ||
} |
51 changes: 51 additions & 0 deletions
51
projects/ngworker/lumberjack/src/lib/lumberjack.module.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import { TestBed } from '@angular/core/testing'; | ||
|
||
import { expectNgModuleToBeGuarded } from '../../tests/expect-ng-module-to-be-guarded'; | ||
|
||
import { | ||
defaultLogConfig, | ||
defaultLogDriverConfig, | ||
LogDriverConfigToken, | ||
LumberjackLogConfig, | ||
LumberjackLogConfigToken, | ||
} from './configs'; | ||
import { LumberjackModule } from './lumberjack.module'; | ||
|
||
describe(LumberjackModule.name, () => { | ||
it(`cannot be imported without using the ${LumberjackModule.forRoot.name} method`, () => { | ||
expectNgModuleToBeGuarded(LumberjackModule); | ||
}); | ||
|
||
describe(LumberjackModule.forRoot.name, () => { | ||
it('accepts a log configuration', () => { | ||
const expectedConfig: LumberjackLogConfig = { | ||
format: ({ message }) => message, | ||
}; | ||
|
||
TestBed.configureTestingModule({ | ||
imports: [LumberjackModule.forRoot(expectedConfig)], | ||
}); | ||
|
||
const actualConfig = TestBed.inject(LumberjackLogConfigToken); | ||
expect(actualConfig).toEqual(expectedConfig); | ||
}); | ||
|
||
it('provides a default log configuration', () => { | ||
TestBed.configureTestingModule({ | ||
imports: [LumberjackModule.forRoot()], | ||
}); | ||
|
||
const actualConfig = TestBed.inject(LumberjackLogConfigToken); | ||
expect(actualConfig).toEqual(defaultLogConfig); | ||
}); | ||
|
||
it('provides a default log driver configuration', () => { | ||
TestBed.configureTestingModule({ | ||
imports: [LumberjackModule.forRoot()], | ||
}); | ||
|
||
const actualConfig = TestBed.inject(LogDriverConfigToken); | ||
expect(actualConfig).toEqual(defaultLogDriverConfig); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
projects/ngworker/lumberjack/src/lib/lumberjack.service.isolated.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { TestBed } from '@angular/core/testing'; | ||
|
||
import { LogDriverConfig, LogDriverConfigToken } from './configs'; | ||
import { createDebugLog } from './log-types'; | ||
import { LumberjackModule } from './lumberjack.module'; | ||
import { LumberjackService } from './lumberjack.service'; | ||
|
||
const allLogLevelsDisabled: LogDriverConfig = { | ||
levels: [], | ||
}; | ||
const createEmptyDebugLog = createDebugLog(''); | ||
const logEmptyDebugMessage = () => TestBed.inject(LumberjackService).log(createEmptyDebugLog()); | ||
|
||
describe(LumberjackService.name, () => { | ||
it('accepts logs when no log drivers are registered', () => { | ||
TestBed.configureTestingModule({ | ||
imports: [LumberjackModule.forRoot()], | ||
}); | ||
|
||
expect(logEmptyDebugMessage).not.toThrow(); | ||
}); | ||
|
||
it('accepts logs when all log levels are disabled', () => { | ||
TestBed.configureTestingModule({ | ||
imports: [LumberjackModule.forRoot()], | ||
providers: [{ provide: LogDriverConfigToken, useValue: allLogLevelsDisabled }], | ||
}); | ||
|
||
expect(logEmptyDebugMessage).not.toThrow(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.