test(product): fix injected types and use individual spies instead of…

… spy objects (#1229)
graycoreio · Jan 20, 2021 · dc66f8b · dc66f8b
1 parent 7a7c2c6
commit dc66f8b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 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
@@ -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<Partial<DaffProductReducersState>>;
+  let store: Store<Partial<DaffProductReducersState>>;
 	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
@@ -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<Partial<DaffProductReducersState>>;
+  let store: Store<Partial<DaffProductReducersState>>;
 	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
@@ -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<Partial<DaffProductReducersState>>;
+  let store: Store<Partial<DaffProductReducersState>>;
   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
@@ -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<Partial<DaffProductReducersState>>;
+  let store: Store<Partial<DaffProductReducersState>>;
   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
@@ -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<any> = null;
 	let resolver: DaffProductPageResolver;
-  let store: MockStore<DaffProductReducersState>;
+  let store: Store<DaffProductReducersState>;
   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
@@ -8,24 +8,19 @@ import { isProduct } from '../../helpers/product-helper';
 
 describe('Driver | Testing | Product | ProductService', () => {
   let productService;
-  let productImageFactory: jasmine.SpyObj<DaffProductImageFactory>;
+  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', () => {