From dc66f8b96fa90ed7ec4a404b9f75d24f00547e5c Mon Sep 17 00:00:00 2001 From: Peter Lauck Date: Mon, 11 Jan 2021 11:28:20 -0500 Subject: [PATCH] test(product): fix injected types and use individual spies instead of spy objects (#1229) --- .../composite-product.facade.spec.ts | 3 +-- .../configurable-product.facade.spec.ts | 3 +-- .../product-grid/product-grid.facade.spec.ts | 3 +-- .../src/facades/product/product.facade.spec.ts | 3 +-- .../product-page/product-page.resolver.spec.ts | 3 +-- .../src/drivers/testing/product.service.spec.ts | 13 ++++--------- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/libs/product/src/facades/composite-product/composite-product.facade.spec.ts b/libs/product/src/facades/composite-product/composite-product.facade.spec.ts index 9c10b4176d..9d7298ae60 100644 --- a/libs/product/src/facades/composite-product/composite-product.facade.spec.ts +++ b/libs/product/src/facades/composite-product/composite-product.facade.spec.ts @@ -1,5 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { MockStore } from '@ngrx/store/testing'; import { Store, StoreModule, combineReducers } from '@ngrx/store'; import { cold } from 'jasmine-marbles'; import { Dictionary } from '@ngrx/entity'; @@ -17,7 +16,7 @@ import { DaffCompositeConfigurationItem } from '../../models/composite-configura import { DaffCompositeProductApplyOption } from '../../actions/composite-product.actions'; describe('DaffCompositeProductFacade', () => { - let store: MockStore>; + let store: Store>; let facade: DaffCompositeProductFacade; let stubCompositeProduct: DaffCompositeProduct; let compositeProductFactory: DaffCompositeProductFactory; diff --git a/libs/product/src/facades/configurable-product/configurable-product.facade.spec.ts b/libs/product/src/facades/configurable-product/configurable-product.facade.spec.ts index 6e3882b1a7..d9d0e66773 100644 --- a/libs/product/src/facades/configurable-product/configurable-product.facade.spec.ts +++ b/libs/product/src/facades/configurable-product/configurable-product.facade.spec.ts @@ -1,5 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { MockStore } from '@ngrx/store/testing'; import { Store, StoreModule, combineReducers } from '@ngrx/store'; import { cold } from 'jasmine-marbles'; @@ -15,7 +14,7 @@ import { DaffConfigurableProductFactory } from '@daffodil/product/testing'; import { DaffConfigurableProductFacade } from './configurable-product.facade'; describe('DaffConfigurableProductFacade', () => { - let store: MockStore>; + let store: Store>; let facade: DaffConfigurableProductFacade; let stubConfigurableProduct: DaffConfigurableProduct; diff --git a/libs/product/src/facades/product-grid/product-grid.facade.spec.ts b/libs/product/src/facades/product-grid/product-grid.facade.spec.ts index 5439367896..c3c308101c 100644 --- a/libs/product/src/facades/product-grid/product-grid.facade.spec.ts +++ b/libs/product/src/facades/product-grid/product-grid.facade.spec.ts @@ -1,5 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { MockStore } from '@ngrx/store/testing'; import { Store, StoreModule, combineReducers } from '@ngrx/store'; import { cold } from 'jasmine-marbles'; @@ -11,7 +10,7 @@ import { DaffProductReducersState } from '../../reducers/product-reducers-state. import { daffProductReducers } from '../../reducers/product-reducers'; describe('DaffProductGridFacade', () => { - let store: MockStore>; + let store: Store>; let facade: DaffProductGridFacade; beforeEach(() => { diff --git a/libs/product/src/facades/product/product.facade.spec.ts b/libs/product/src/facades/product/product.facade.spec.ts index 0ee8b6bb82..0ff3041ca7 100644 --- a/libs/product/src/facades/product/product.facade.spec.ts +++ b/libs/product/src/facades/product/product.facade.spec.ts @@ -1,5 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { MockStore } from '@ngrx/store/testing'; import { Store, StoreModule, combineReducers } from '@ngrx/store'; import { cold } from 'jasmine-marbles'; @@ -15,7 +14,7 @@ import { DaffProductFactory } from '@daffodil/product/testing'; import { daffSubtract } from '@daffodil/core'; describe('DaffProductFacade', () => { - let store: MockStore>; + let store: Store>; let facade: DaffProductFacade; beforeEach(() => { diff --git a/libs/product/src/resolvers/product-page/product-page.resolver.spec.ts b/libs/product/src/resolvers/product-page/product-page.resolver.spec.ts index dec23d066c..cc97ec4a0e 100644 --- a/libs/product/src/resolvers/product-page/product-page.resolver.spec.ts +++ b/libs/product/src/resolvers/product-page/product-page.resolver.spec.ts @@ -3,7 +3,6 @@ import { StoreModule, combineReducers, Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { provideMockActions } from '@ngrx/effects/testing'; import { ActivatedRoute } from '@angular/router'; -import { MockStore } from '@ngrx/store/testing'; import { fail } from 'assert'; import { PLATFORM_ID } from '@angular/core'; import { ɵPLATFORM_BROWSER_ID, ɵPLATFORM_SERVER_ID } from '@angular/common'; @@ -19,7 +18,7 @@ import { DaffProductReducersState } from '../../reducers/public_api'; describe('DaffProductPageResolver', () => { const actions$: Observable = null; let resolver: DaffProductPageResolver; - let store: MockStore; + let store: Store; let ProductFactory: DaffProductFactory; let stubProduct: DaffProduct; let route: ActivatedRoute; diff --git a/libs/product/testing/src/drivers/testing/product.service.spec.ts b/libs/product/testing/src/drivers/testing/product.service.spec.ts index 73d8158704..8ce3027101 100644 --- a/libs/product/testing/src/drivers/testing/product.service.spec.ts +++ b/libs/product/testing/src/drivers/testing/product.service.spec.ts @@ -8,24 +8,19 @@ import { isProduct } from '../../helpers/product-helper'; describe('Driver | Testing | Product | ProductService', () => { let productService; - let productImageFactory: jasmine.SpyObj; + let productImageFactory: DaffProductImageFactory; let stubProductImages: DaffProductImage[]; beforeEach(() => { stubProductImages = new DaffProductImageFactory().createMany(5); - const productImageFactorySpy = jasmine.createSpyObj('DaffProductImageFactory', ['createMany', 'create']); - TestBed.configureTestingModule({ - providers: [ - { provide: DaffProductImageFactory, useValue: productImageFactorySpy } - ] - }); + TestBed.configureTestingModule({}); productService = TestBed.inject(DaffTestingProductService); productImageFactory = TestBed.inject(DaffProductImageFactory); - productImageFactory.createMany.and.returnValue(stubProductImages); - productImageFactory.create.and.returnValue(stubProductImages[0]); + spyOn(productImageFactory, 'createMany').and.returnValue(stubProductImages); + spyOn(productImageFactory, 'create').and.returnValue(stubProductImages[0]); }); it('should be created', () => {