test(component): update usage of TestBed.get to TestBed.inject

angular 9 compatibillity changes for TestBed Closes ngrx#2240 test(docs): test cases updated in docs TestBed.get replaced by TestBed.inject Closes #ngrx#2240 test(component): example tests type fixed TestBed.get replace by TestBed.inject done test(component): test issue fixed angular 9 test upgrade changes done test(component): changes under docs folder is reverted angular 9 test upgrade changes test(component): src tests changes reverted angular 9 test upgrade changes test(component): reverted unnecessary testing changes content folder changes are kept changes test(component): update usage of TestBed.get to TestBed.inject angular 9 compatibillity changes for TestBed Closes ngrx#2240 test(docs): test cases updated in docs TestBed.get replaced by TestBed.inject Closes #ngrx#2240 test(component): example tests type fixed TestBed.get replace by TestBed.inject done test(component): test issue fixed angular 9 test upgrade changes done test(component): changes under docs folder is reverted angular 9 test upgrade changes test(component): src tests changes reverted angular 9 test upgrade changes test(component): reverted unnecessary testing changes content folder changes are kept changes
sumitparakh · Jan 10, 2020 · 6adf6eb · 6adf6eb
1 parent e9d6189
commit 6adf6eb
Show file tree

Hide file tree

Showing 41 changed files with 132 additions and 136 deletions.
diff --git a/docs/effects/testing.md b/docs/effects/testing.md
@@ -84,7 +84,7 @@ describe('My Effects', () => {
       ],
     });
 
-    effects = TestBed.inject(MyEffects);
+    effects = TestBed.get(MyEffects);
   });
 
   it('should work', () => {
@@ -122,7 +122,7 @@ describe('My Effects', () => {
       ],
     });
 
-    effects = TestBed.inject(MyEffects);
+    effects = TestBed.get(MyEffects);
     metadata = getEffectsMetadata(effects);
   });
 

diff --git a/modules/data/spec/effects/entity-cache-effects.spec.ts b/modules/data/spec/effects/entity-cache-effects.spec.ts
@@ -65,9 +65,9 @@ describe('EntityCacheEffects (normal testing)', () => {
       ],
     });
 
-    actions$ = TestBed.inject<any>(Actions);
-    effects = TestBed.inject(EntityCacheEffects);
-    dataService = TestBed.inject<any>(EntityCacheDataService);
+    actions$ = TestBed.get(Actions);
+    effects = TestBed.get(EntityCacheEffects);
+    dataService = TestBed.get(EntityCacheDataService);
   });
 
   it('should return a SAVE_ENTITIES_SUCCESS with the expected ChangeSet on success', (done: DoneFn) => {

diff --git a/modules/data/spec/entity-metadata/entity-definition.service.spec.ts b/modules/data/spec/entity-metadata/entity-definition.service.spec.ts
@@ -37,7 +37,7 @@ describe('EntityDefinitionService', () => {
         { provide: ENTITY_METADATA_TOKEN, multi: true, useValue: metadataMap },
       ],
     });
-    service = TestBed.inject(EntityDefinitionService);
+    service = TestBed.get(EntityDefinitionService);
   });
 
   describe('#getDefinition', () => {

diff --git a/modules/data/spec/selectors/related-entity-selectors.spec.ts b/modules/data/spec/selectors/related-entity-selectors.spec.ts
@@ -47,9 +47,9 @@ describe('Related-entity Selectors', () => {
       ],
     });
 
-    store = TestBed.inject(Store);
-    eaFactory = TestBed.inject(EntityActionFactory);
-    entitySelectorsFactory = TestBed.inject(EntitySelectorsFactory);
+    store = TestBed.get(Store);
+    eaFactory = TestBed.get(EntityActionFactory);
+    entitySelectorsFactory = TestBed.get(EntitySelectorsFactory);
     initializeCache(eaFactory, store);
   });
 

diff --git a/modules/data/spec/utils/default-pluralizer.spec.ts b/modules/data/spec/utils/default-pluralizer.spec.ts
@@ -10,7 +10,7 @@ describe('DefaultPluralizer', () => {
         providers: [{ provide: Pluralizer, useClass: DefaultPluralizer }],
       });
 
-      pluralizer = TestBed.inject(Pluralizer);
+      pluralizer = TestBed.get(Pluralizer);
     });
     it('should turn "Hero" to "Heros" because no plural names map', () => {
       // No map so 'Hero' gets default pluralization
@@ -70,7 +70,7 @@ describe('DefaultPluralizer', () => {
         ],
       });
 
-      pluralizer = TestBed.inject(Pluralizer);
+      pluralizer = TestBed.get(Pluralizer);
     });
 
     it('should pluralize "Villain" which is not in plural names', () => {

diff --git a/...atics/ng-add/files/__name@dasherize@if-flat__/__name@dasherize__.effects.spec.ts.template b/...atics/ng-add/files/__name@dasherize@if-flat__/__name@dasherize__.effects.spec.ts.template
@@ -16,7 +16,7 @@ describe('<%= classify(name) %>Effects', () => {
       ]
     });
 
-    effects = TestBed.inject<<%= classify(name) %>Effects>(<%= classify(name) %>Effects);
+    effects = TestBed.get<<%= classify(name) %>Effects>(<%= classify(name) %>Effects);
   });
 
   it('should be created', () => {

diff --git a/modules/effects/schematics/ng-add/index.spec.ts b/modules/effects/schematics/ng-add/index.spec.ts
@@ -219,7 +219,7 @@ describe('Effects ng-add Schematic', () => {
     );
 
     expect(content).toMatch(
-      /effects = TestBed\.inject<FooEffects>\(FooEffects\);/
+      /effects = TestBed\.get<FooEffects>\(FooEffects\);/
     );
   });
 });
diff --git a/modules/effects/spec/effect_sources.spec.ts b/modules/effects/spec/effect_sources.spec.ts
@@ -30,8 +30,8 @@ describe('EffectSources', () => {
       ],
     });
 
-    mockErrorReporter = TestBed.inject(ErrorHandler);
-    effectSources = TestBed.inject(EffectSources);
+    mockErrorReporter = TestBed.get(ErrorHandler);
+    effectSources = TestBed.get(EffectSources);
 
     spyOn(mockErrorReporter, 'handleError');
   });
@@ -54,7 +54,7 @@ describe('EffectSources', () => {
 
     effectSources.addEffects(new EffectWithInitAction());
 
-    const store = TestBed.inject(Store);
+    const store = TestBed.get(Store);
     expect(store.dispatch).toHaveBeenCalledWith({
       type: '[EffectWithInitAction] Init',
     });

diff --git a/modules/effects/spec/effects_feature_module.spec.ts b/modules/effects/spec/effects_feature_module.spec.ts
@@ -40,11 +40,11 @@ describe('Effects Feature Module', () => {
         ],
       });
 
-      mockEffectSources = TestBed.inject<any>(EffectsRootModule);
+      mockEffectSources = TestBed.get<any>(EffectsRootModule);
     });
 
     it('should add all effects when instantiated', () => {
-      TestBed.inject(EffectsFeatureModule);
+      TestBed.get(EffectsFeatureModule);
 
       expect(mockEffectSources.addEffects).toHaveBeenCalledWith(sourceA);
       expect(mockEffectSources.addEffects).toHaveBeenCalledWith(sourceB);
@@ -61,8 +61,8 @@ describe('Effects Feature Module', () => {
         imports: [AppModule],
       });
 
-      effects = TestBed.inject(FeatureEffects);
-      store = TestBed.inject(Store);
+      effects = TestBed.get(FeatureEffects);
+      store = TestBed.get(Store);
     });
 
     it('should have the feature state defined to select from the effect', (done: any) => {

diff --git a/modules/effects/spec/effects_root_module.spec.ts b/modules/effects/spec/effects_root_module.spec.ts
@@ -20,7 +20,7 @@ describe('Effects Root Module', () => {
       ],
     });
 
-    const store = TestBed.inject(Store);
+    const store = TestBed.get(Store);
 
     expect(reducer).toHaveBeenCalledWith(foo, {
       type: INIT,
@@ -37,7 +37,7 @@ describe('Effects Root Module', () => {
       ],
     });
 
-    const store = TestBed.inject(Store);
+    const store = TestBed.get(Store);
 
     expect(reducer).toHaveBeenCalledWith(foo, {
       type: INIT,

diff --git a/modules/effects/spec/integration.spec.ts b/modules/effects/spec/integration.spec.ts
@@ -38,9 +38,9 @@ describe('NgRx Effects Integration spec', () => {
       ],
     });
 
-    const store = TestBed.inject(Store) as Store<any>;
+    const store = TestBed.get(Store) as Store<any>;
 
-    const effectSources = TestBed.inject(EffectSources) as EffectSources;
+    const effectSources = TestBed.get(EffectSources) as EffectSources;
     effectSources.addEffects(new FeatEffectWithIdentifierAndInitAction('one'));
     effectSources.addEffects(new FeatEffectWithIdentifierAndInitAction('two'));
     effectSources.addEffects(new FeatEffectWithIdentifierAndInitAction('one'));
@@ -81,10 +81,8 @@ describe('NgRx Effects Integration spec', () => {
   });
 
   it('throws if forRoot() is used more than once', (done: DoneFn) => {
-    let router: Router = TestBed.inject(Router);
-    const loader: SpyNgModuleFactoryLoader = TestBed.inject<any>(
-      NgModuleFactoryLoader
-    );
+    let router: Router = TestBed.get(Router);
+    const loader: SpyNgModuleFactoryLoader = TestBed.get(NgModuleFactoryLoader);
 
     loader.stubbedModules = { feature: FeatModuleWithForRoot };
     router.resetConfig([{ path: 'feature-path', loadChildren: 'feature' }]);

diff --git a/modules/router-store/spec/integration.spec.ts b/modules/router-store/spec/integration.spec.ts
@@ -38,7 +38,7 @@ describe('integration spec', () => {
 
     createTestModule({ reducers: { reducer } });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -113,7 +113,7 @@ describe('integration spec', () => {
       ) => state.url !== 'next',
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     const hasRouterState = (action: RouterAction<any>) =>
@@ -148,7 +148,7 @@ describe('integration spec', () => {
 
     createTestModule({ reducers: { reducer } });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -192,7 +192,7 @@ describe('integration spec', () => {
       canActivate: () => false,
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -271,8 +271,8 @@ describe('integration spec', () => {
       config: { stateKey: 'reducer' },
     });
 
-    const router: Router = TestBed.inject(Router);
-    const store: Store<any> = TestBed.inject(Store);
+    const router: Router = TestBed.get(Router);
+    const store: Store<any> = TestBed.get(Store);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -330,7 +330,7 @@ describe('integration spec', () => {
       },
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -417,8 +417,8 @@ describe('integration spec', () => {
       config: { stateKey: 'reducer' },
     });
 
-    const router: Router = TestBed.inject(Router);
-    const store: Store<any> = TestBed.inject(Store);
+    const router: Router = TestBed.get(Router);
+    const store: Store<any> = TestBed.get(Store);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -460,8 +460,8 @@ describe('integration spec', () => {
 
     createTestModule({ reducers: { router: routerReducer, reducer } });
 
-    const router = TestBed.inject(Router);
-    const store = TestBed.inject(Store);
+    const router = TestBed.get(Router);
+    const store = TestBed.get(Store);
     const log = logOfRouterAndActionsAndStore();
 
     const routerReducerStates: any[] = [];
@@ -565,7 +565,7 @@ describe('integration spec', () => {
       canLoad: () => false,
     });
 
-    const router = TestBed.inject(Router);
+    const router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router.navigateByUrl('/load').then((r: boolean) => {
@@ -597,7 +597,7 @@ describe('integration spec', () => {
       canLoad: () => Promise.reject('boom'),
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -670,7 +670,7 @@ describe('integration spec', () => {
       createTestModule({ reducers: { routerReducer, reducer }, providers });
     }
 
-    const router = TestBed.inject(Router);
+    const router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -725,8 +725,8 @@ describe('integration spec', () => {
       },
     });
 
-    const router: Router = TestBed.inject(Router);
-    const store: Store<any> = TestBed.inject(Store);
+    const router: Router = TestBed.get(Router);
+    const store: Store<any> = TestBed.get(Store);
     const log = logOfRouterAndActionsAndStore();
 
     router
@@ -773,7 +773,7 @@ describe('integration spec', () => {
       config: { stateKey: 'router-reducer' },
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore({ stateKey: 'router-reducer' });
 
     router
@@ -835,7 +835,7 @@ describe('integration spec', () => {
       config: { stateKey: (state: any) => state.routerReducer },
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore({
       stateKey: (state: any) => state.routerReducer,
     });
@@ -899,8 +899,8 @@ describe('integration spec', () => {
       config: { stateKey: 'reducer' },
     });
 
-    const router: Router = TestBed.inject(Router);
-    const store = TestBed.inject(Store);
+    const router: Router = TestBed.get(Router);
+    const store = TestBed.get(Store);
     const log = logOfRouterAndActionsAndStore();
 
     store.dispatch({
@@ -956,7 +956,7 @@ describe('integration spec', () => {
       config: { navigationActionTiming: NavigationActionTiming.PostActivation },
     });
 
-    const router: Router = TestBed.inject(Router);
+    const router: Router = TestBed.get(Router);
     const log = logOfRouterAndActionsAndStore();
 
     router.navigateByUrl('/').then(() => {
@@ -1002,10 +1002,10 @@ function logOfRouterAndActionsAndStore(
     stateKey: 'reducer',
   }
 ): any[] {
-  const router: Router = TestBed.inject(Router);
-  const store: Store<any> = TestBed.inject(Store);
+  const router: Router = TestBed.get(Router);
+  const store: Store<any> = TestBed.get(Store);
   // Not using effects' Actions to avoid @ngrx/effects dependency
-  const actions$: ScannedActionsSubject = TestBed.inject(ScannedActionsSubject);
+  const actions$: ScannedActionsSubject = TestBed.get(ScannedActionsSubject);
   const log: any[] = [];
   router.events.subscribe(e => {
     if (e.hasOwnProperty('url')) {

diff --git a/modules/router-store/spec/router_store_module.spec.ts b/modules/router-store/spec/router_store_module.spec.ts
@@ -36,9 +36,9 @@ describe('Router Store Module', () => {
         },
       });
 
-      store = TestBed.inject(Store);
-      router = TestBed.inject(Router);
-      storeRouterConnectingModule = TestBed.inject(StoreRouterConnectingModule);
+      store = TestBed.get(Store);
+      router = TestBed.get(Router);
+      storeRouterConnectingModule = TestBed.get(StoreRouterConnectingModule);
     });
 
     it('should have custom state key as own property', () => {
@@ -95,9 +95,9 @@ describe('Router Store Module', () => {
         },
       });
 
-      store = TestBed.inject(Store);
-      router = TestBed.inject(Router);
-      storeRouterConnectingModule = TestBed.inject(StoreRouterConnectingModule);
+      store = TestBed.get(Store);
+      router = TestBed.get(Router);
+      storeRouterConnectingModule = TestBed.get(StoreRouterConnectingModule);
     });
 
     it('should have same state selector as own property', () => {
@@ -145,11 +145,9 @@ describe('Router Store Module', () => {
       });
 
       return {
-        actions: TestBed.inject(ActionsSubject) as ActionsSubject,
-        router: TestBed.inject(Router) as Router,
-        serializer: TestBed.inject(
-          RouterStateSerializer
-        ) as RouterStateSerializer,
+        actions: TestBed.get(ActionsSubject) as ActionsSubject,
+        router: TestBed.get(Router) as Router,
+        serializer: TestBed.get(RouterStateSerializer) as RouterStateSerializer,
       };
     }
 

diff --git a/.../container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template b/.../container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template
@@ -20,7 +20,7 @@ describe('<%= classify(name) %>Component', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(<%= classify(name) %>Component);
     component = fixture.componentInstance;
-    store = TestBed.inject<Store>(Store);
+    store = TestBed.get<Store>(Store);
 
     fixture.detectChanges();
   });
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ describe('<%= classify(name) %>Effects', () => { @@
           ]
         });
-        effects = TestBed.inject<<%= classify(name) %>Effects>(<%= classify(name) %>Effects);
+        effects = TestBed.get<<%= classify(name) %>Effects>(<%= classify(name) %>Effects);
       });
       it('should be created', () => {
@@ Expand Down @@