From 5a252664cdcfa9fb532158cf9674b1fa83e1df2b Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Tue, 5 May 2020 22:44:01 +0200 Subject: [PATCH] fix(schematics): components should inject the store without generic --- .../__name@dasherize__.component.spec.ts.template | 2 +- modules/schematics/src/container/index.spec.ts | 5 ++--- modules/schematics/src/container/index.ts | 6 +----- .../__name@dasherize__.component.spec.ts.template | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/schematics/src/container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template b/modules/schematics/src/container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template index d4501e713b..ecd4e2118f 100644 --- a/modules/schematics/src/container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template +++ b/modules/schematics/src/container/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template @@ -6,7 +6,7 @@ import { provideMockStore, MockStore } from '@ngrx/store/testing'; describe('<%= classify(name) %>Component', () => { let component: <%= classify(name) %>Component; let fixture: ComponentFixture<<%= classify(name) %>Component>; - let store: MockStore; + let store: MockStore; beforeEach(async() => { TestBed.configureTestingModule({ diff --git a/modules/schematics/src/container/index.spec.ts b/modules/schematics/src/container/index.spec.ts index ba350c5d4e..fbde0a0109 100644 --- a/modules/schematics/src/container/index.spec.ts +++ b/modules/schematics/src/container/index.spec.ts @@ -103,9 +103,8 @@ describe('Container Schematic', () => { const content = tree.readContent( `${projectPath}/src/app/foo/foo.component.ts` ); - expect(content).toMatch( - /constructor\(private store\: Store\\) { }\n\n/ - ); + + expect(content).toMatch(/constructor\(private store\: Store\) { }\n\n/); }); it('should update the component spec', async () => { diff --git a/modules/schematics/src/container/index.ts b/modules/schematics/src/container/index.ts index c97b97390b..391024406c 100644 --- a/modules/schematics/src/container/index.ts +++ b/modules/schematics/src/container/index.ts @@ -90,13 +90,9 @@ function addStateToComponent(options: Partial) { ); const cmpCtr = componentConstructor as ts.ConstructorDeclaration; const { pos } = cmpCtr; - const stateType = options.state - ? `fromStore.${options.stateInterface}` - : 'any'; const constructorText = cmpCtr.getText(); const [start, end] = constructorText.split('()'); - const storeText = `private store: Store<${stateType}>`; - const storeConstructor = [start, `(${storeText})`, end].join(''); + const storeConstructor = [start, `(private store: Store)`, end].join(''); const constructorUpdate = new ReplaceChange( componentPath, pos, diff --git a/modules/schematics/src/container/integration-files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template b/modules/schematics/src/container/integration-files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template index 878619ae2e..5fcf2e8544 100644 --- a/modules/schematics/src/container/integration-files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template +++ b/modules/schematics/src/container/integration-files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template @@ -6,7 +6,7 @@ import { Store, StoreModule } from '@ngrx/store'; describe('<%= classify(name) %>Component', () => { let component: <%= classify(name) %>Component; let fixture: ComponentFixture<<%= classify(name) %>Component>; - let store: Store; + let store: Store; beforeEach(async() => { TestBed.configureTestingModule({