feat: allow overriding global teardown options (#502)

ngneat · Oct 26, 2021 · e25b5eb · e25b5eb
1 parent 39dec2a
commit e25b5eb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/projects/spectator/src/lib/base/initial-module.ts b/projects/spectator/src/lib/base/initial-module.ts
@@ -27,8 +27,12 @@ export function initialModule(options: Required<BaseSpectatorOptions>): ModuleMe
  return {
  declarations: [...globals.declarations, ...options.declarations, ...options.entryComponents],
  imports: [...(options.disableAnimations ? [NoopAnimationsModule] : []), ...globals.imports, ...options.imports],
- providers: [...globals.providers, ...options.providers, ...options.mocks.map(type => options.mockProvider(type))],
+ providers: [...globals.providers, ...options.providers, ...options.mocks.map((type) => options.mockProvider(type))],
  entryComponents: [...options.entryComponents],
- teardown: {...options.teardown}
+ teardown:
+ // Caretaker note: we don't want to merge the `globals.teardown` and `options.teardown`, since `options.teardown`
+ // is always defined. If the user calls `defineGlobalsInjections({ teardown: { ... } })` and we merge it with
+ // `options.teardown`, then `options.teardown` will always override global options.
+ { ...(globals.teardown || options.teardown) },
  };
 }