fix test

graycoreio · Nov 21, 2023 · 8bdb152 · 8bdb152
1 parent 78cb734
commit 8bdb152
Show file tree

Hide file tree

Showing 33 changed files with 126 additions and 256 deletions.
diff --git a/...tification/components/add-to-cart-notification/add-to-cart-notification.component.spec.ts b/...tification/components/add-to-cart-notification/add-to-cart-notification.component.spec.ts
@@ -61,7 +61,7 @@ describe('AddToCartNotificationComponent', () => {
     [DAFF_PRODUCT_STORE_FEATURE_KEY]: DaffProductReducersState<DaffProduct>;
   }>;
   const productFactory: DaffProductFactory = new DaffProductFactory();
-  const cartFactory: DaffCartFactory = new DaffCartFactory();
+  const cartFactory: DaffCartFactory = TestBed.inject(DaffCartFactory);
 
   let addToCartNotification: AddToCartNotificationComponent;
   let productAdded: MockProductAddedComponent;

diff --git a/...art/components/add-to-cart-notification/reducers/add-to-cart-notification.reducer.spec.ts b/...art/components/add-to-cart-notification/reducers/add-to-cart-notification.reducer.spec.ts
@@ -98,7 +98,7 @@ describe('Add To Cart Notification | Reducer', () => {
   describe('when AddToCartSuccess action is triggered', () => {
 
     let result;
-    const cartFactory = new DaffCartFactory();
+    const cartFactory = TestBed.inject(DaffCartFactory);
     const stubCart: DaffCart = cartFactory.create();
 
     beforeEach(() => {

diff --git a/apps/demo/src/app/cart/components/cart-items/cart-items.component.spec.ts b/apps/demo/src/app/cart/components/cart-items/cart-items.component.spec.ts
@@ -36,7 +36,7 @@ describe('CartItemsComponent', () => {
   let cartItems;
   let cart: CartItemsComponent;
 
-  const cartFactory = new DaffCartFactory();
+  const cartFactory = TestBed.inject(DaffCartFactory);
   const mockCart = cartFactory.create({
     items: new DaffCartItemFactory().createMany(2),
   });

diff --git a/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.component.spec.ts b/apps/demo/src/app/cart/components/cart-sidebar/cart-sidebar.component.spec.ts
@@ -51,7 +51,7 @@ describe('CartSidebar', () => {
 
   let summaryElement: DebugElement;
 
-  const cartFactory = new DaffCartFactory();
+  const cartFactory = TestBed.inject(DaffCartFactory);
   const cart = cartFactory.create();
 
   beforeEach(waitForAsync(() => {

diff --git a/.../demo/src/app/cart/components/cart-summary-wrapper/cart-summary-wrapper.component.spec.ts b/.../demo/src/app/cart/components/cart-summary-wrapper/cart-summary-wrapper.component.spec.ts
@@ -22,7 +22,7 @@ import { DaffLoadingIconModule } from '@daffodil/design';
 import { CartSummaryWrapperComponent } from './cart-summary-wrapper.component';
 import { CartSummaryComponent } from '../cart-summary/cart-summary.component';
 
-const cartFactory = new DaffCartFactory();
+const cartFactory = TestBed.inject(DaffCartFactory);
 const cart = cartFactory.create();
 const stubCartTitle = 'cartTitle';
 

diff --git a/apps/demo/src/app/cart/components/cart-totals/cart-totals.component.spec.ts b/apps/demo/src/app/cart/components/cart-totals/cart-totals.component.spec.ts
@@ -30,7 +30,7 @@ describe('CartTotalsComponent', () => {
   let cartTotalsComponent: CartTotalsComponent;
   let cartTotalsItemComponent: any;
   let currencyPipe;
-  const cartFactory = new DaffCartFactory();
+  const cartFactory = TestBed.inject(DaffCartFactory);
   const cartItemFactory = new DaffCartItemFactory();
 
   const mockCart = cartFactory.create({

diff --git a/apps/demo/src/app/cart/components/cart/cart.component.spec.ts b/apps/demo/src/app/cart/components/cart/cart.component.spec.ts
@@ -66,7 +66,7 @@ describe('Cart', () => {
   let cartItemCountElement: DebugElement;
   let cartItemCountComponent: MockCartItemCountComponent;
 
-  const cartFactory = new DaffCartFactory();
+  const cartFactory = TestBed.inject(DaffCartFactory);
   const cart = cartFactory.create();
 
   beforeEach(waitForAsync(() => {

diff --git a/apps/demo/src/app/cart/pages/cart-view/cart-view.component.spec.ts b/apps/demo/src/app/cart/pages/cart-view/cart-view.component.spec.ts
@@ -23,7 +23,7 @@ import {
 
 import { DemoCartViewComponent } from './cart-view.component';
 
-const cartFactory = new DaffCartFactory();
+const cartFactory = TestBed.inject(DaffCartFactory);
 const cart = cartFactory.create();
 
 @Component({

diff --git a/apps/demo/src/app/cart/routing-resolvers/effects/cart-resolver.effects.spec.ts b/apps/demo/src/app/cart/routing-resolvers/effects/cart-resolver.effects.spec.ts
@@ -49,7 +49,7 @@ describe('CartResolverEffects', () => {
         provideMockActions(() => actions$),
         {
           provide: DaffCartDriver,
-          useValue: new DaffTestingCartService(new DaffCartFactory()),
+          useValue: new DaffTestingCartService(TestBed.inject(DaffCartFactory)),
         },
       ],
     });

diff --git a/apps/demo/src/app/checkout/effects/checkout.effects.spec.ts b/apps/demo/src/app/checkout/effects/checkout.effects.spec.ts
@@ -20,7 +20,7 @@ describe('CheckoutEffects', () => {
   let actions$: Observable<any>;
   let effects: CheckoutEffects;
   let router: Router;
-  const cartFactory: DaffCartFactory = new DaffCartFactory();
+  const cartFactory: DaffCartFactory = TestBed.inject(DaffCartFactory);
   let stubCart: DaffCart;
 
   beforeEach(() => {

diff --git a/apps/demo/src/app/checkout/pages/checkout-view/checkout-view.component.spec.ts b/apps/demo/src/app/checkout/pages/checkout-view/checkout-view.component.spec.ts
@@ -51,7 +51,7 @@ import * as fromDemoCheckout from '../../reducers/index';
 
 const daffodilAddressFactory = new DaffAddressFactory();
 const paymentFactory = new DaffPaymentFactory();
-const cartFactory = new DaffCartFactory();
+const cartFactory = TestBed.inject(DaffCartFactory);
 const cartItemFactory = new DaffCartItemFactory();
 
 const stubShippingAddress = daffodilAddressFactory.create();

diff --git a/apps/demo/src/app/thank-you/pages/thank-you-view.component.spec.ts b/apps/demo/src/app/thank-you/pages/thank-you-view.component.spec.ts
@@ -30,7 +30,7 @@ import {
 
 import { ThankYouViewComponent } from './thank-you-view.component';
 
-const cartFactory = new DaffCartFactory();
+const cartFactory = TestBed.inject(DaffCartFactory);
 const cartItemFactory = new DaffCartItemFactory();
 const stubCart: DaffCart = cartFactory.create({ items: [cartItemFactory.create()]});
 

diff --git a/libs/authorizenet/state/src/effects/authorize-net.effects.spec.ts b/libs/authorizenet/state/src/effects/authorize-net.effects.spec.ts
@@ -156,7 +156,7 @@ describe('DaffAuthorizeNetEffects', () => {
   describe('updatePaymentSuccessSubstream$', () => {
 
     it('should dispatch DaffAuthorizeNetUpdatePaymentSuccess when the cart payment method has been successfully updated', () => {
-      const stubCart = new DaffCartFactory().create();
+      const stubCart = TestBed.inject(DaffCartFactory).create();
       const authorizeNetUpdatePayment = new DaffAuthorizeNetUpdatePayment(paymentTokenRequest, stubAddress);
       const cartPaymentUpdateWithBillingSuccess = new DaffCartPaymentUpdateWithBillingSuccess(stubCart);
       const authorizeNetPaymentUpdateSuccess = new DaffAuthorizeNetUpdatePaymentSuccess();

diff --git a/libs/cart/driver/magento/src/transforms/outputs/cart-totals-transformer.spec.ts b/libs/cart/driver/magento/src/transforms/outputs/cart-totals-transformer.spec.ts
@@ -1,9 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
-import {
-  DaffCart,
-  DaffCartTotalTypeEnum,
-} from '@daffodil/cart';
+import { DaffCartTotalTypeEnum } from '@daffodil/cart';
 import { MagentoCart } from '@daffodil/cart/driver/magento';
 import { MagentoCartFactory } from '@daffodil/cart/driver/magento/testing';
 import { daffAdd } from '@daffodil/core';
@@ -12,12 +9,11 @@ import { transformCartTotals } from './cart-totals-transformer';
 
 describe('transformCartTotals', () => {
   let stubMagentoCart: MagentoCart;
-  let expectedTotals: {totals: DaffCart['totals']};
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
 
-    stubMagentoCart = new MagentoCartFactory().create({
+    stubMagentoCart = TestBed.inject(MagentoCartFactory).create({
       shipping_addresses: [
         {
           selected_shipping_method: {
@@ -28,97 +24,22 @@ describe('transformCartTotals', () => {
         },
       ],
     });
-    const totalTax = stubMagentoCart.prices.applied_taxes.reduce((acc, tax) => (daffAdd(acc, tax.amount.value)), 0);
-    expectedTotals = {
-      totals: [
-        {
-          name: DaffCartTotalTypeEnum.grandTotal,
-          label: 'Grand Total',
-          value: stubMagentoCart.prices.grand_total.value,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalExcludingTax,
-          label: 'Subtotal Excluding Tax',
-          value: stubMagentoCart.prices.subtotal_excluding_tax.value,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalIncludingTax,
-          label: 'Subtotal Including Tax',
-          value: stubMagentoCart.prices.subtotal_including_tax.value,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax,
-          label: 'Subtotal with Discount Excluding Tax',
-          value: stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax,
-          label: 'Subtotal with Discount Including Tax',
-          value: daffAdd(stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value, totalTax),
-        },
-        {
-          name: DaffCartTotalTypeEnum.tax,
-          label: 'Tax',
-          value: totalTax,
-        },
-        ...stubMagentoCart.prices.discounts.map(discount => ({
-          name: DaffCartTotalTypeEnum.discount,
-          label: discount.label,
-          value: discount.amount.value,
-        })),
-        {
-          name: DaffCartTotalTypeEnum.shipping,
-          label: 'Shipping',
-          value: stubMagentoCart.shipping_addresses[0].selected_shipping_method.amount.value,
-        },
-      ],
-    };
   });
 
   it('should transform cart totals', () => {
-    expect(transformCartTotals(stubMagentoCart)).toEqual(expectedTotals);
+    const totalTax = stubMagentoCart.prices.applied_taxes.reduce((acc, tax) => (daffAdd(acc, tax.amount.value)), 0);
+    const transformedTotals = transformCartTotals(stubMagentoCart).totals;
+
+    expect(transformedTotals[DaffCartTotalTypeEnum.grandTotal].value).toEqual(stubMagentoCart.prices.grand_total.value);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalExcludingTax].value).toEqual(stubMagentoCart.prices.subtotal_excluding_tax.value);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalIncludingTax].value).toEqual(stubMagentoCart.prices.subtotal_including_tax.value);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax].value).toEqual(stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax].value).toEqual(daffAdd(stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value, totalTax));
+    expect(transformedTotals[DaffCartTotalTypeEnum.tax].value).toEqual(totalTax);
+    expect(transformedTotals[DaffCartTotalTypeEnum.shipping].value).toEqual(stubMagentoCart.shipping_addresses[0].selected_shipping_method.amount.value);
   });
 
   it('should transform cart totals when magento gives null/empty values', () => {
-    expectedTotals = {
-      totals: [
-        {
-          name: DaffCartTotalTypeEnum.grandTotal,
-          label: 'Grand Total',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalExcludingTax,
-          label: 'Subtotal Excluding Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalIncludingTax,
-          label: 'Subtotal Including Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax,
-          label: 'Subtotal with Discount Excluding Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax,
-          label: 'Subtotal with Discount Including Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.tax,
-          label: 'Tax',
-          value: 0,
-        },
-        {
-          name: DaffCartTotalTypeEnum.shipping,
-          label: 'Shipping',
-          value: null,
-        },
-      ],
-    };
     stubMagentoCart.prices.applied_taxes = [];
     stubMagentoCart.prices.discounts = [];
     stubMagentoCart.prices.grand_total.value = null;
@@ -127,49 +48,18 @@ describe('transformCartTotals', () => {
     stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value = null;
     stubMagentoCart.shipping_addresses[0].selected_shipping_method.amount.value = null;
 
-    expect(transformCartTotals(stubMagentoCart)).toEqual(expectedTotals);
+    const transformedTotals = transformCartTotals(stubMagentoCart).totals;
+
+    expect(transformedTotals[DaffCartTotalTypeEnum.grandTotal].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalExcludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalIncludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.tax].value).toEqual(0);
+    expect(transformedTotals[DaffCartTotalTypeEnum.shipping].value).toEqual(null);
   });
 
   it('should transform cart totals when magento gives empty shipping addresses', () => {
-    expectedTotals = {
-      totals: [
-        {
-          name: DaffCartTotalTypeEnum.grandTotal,
-          label: 'Grand Total',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalExcludingTax,
-          label: 'Subtotal Excluding Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalIncludingTax,
-          label: 'Subtotal Including Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax,
-          label: 'Subtotal with Discount Excluding Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax,
-          label: 'Subtotal with Discount Including Tax',
-          value: null,
-        },
-        {
-          name: DaffCartTotalTypeEnum.tax,
-          label: 'Tax',
-          value: 0,
-        },
-        {
-          name: DaffCartTotalTypeEnum.shipping,
-          label: 'Shipping',
-          value: null,
-        },
-      ],
-    };
     stubMagentoCart.prices.applied_taxes = [];
     stubMagentoCart.prices.discounts = [];
     stubMagentoCart.prices.grand_total.value = null;
@@ -178,6 +68,14 @@ describe('transformCartTotals', () => {
     stubMagentoCart.prices.subtotal_with_discount_excluding_tax.value = null;
     stubMagentoCart.shipping_addresses = null;
 
-    expect(transformCartTotals(stubMagentoCart)).toEqual(expectedTotals);
+    const transformedTotals = transformCartTotals(stubMagentoCart).totals;
+
+    expect(transformedTotals[DaffCartTotalTypeEnum.grandTotal].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalExcludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalIncludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax].value).toEqual(null);
+    expect(transformedTotals[DaffCartTotalTypeEnum.tax].value).toEqual(0);
+    expect(transformedTotals[DaffCartTotalTypeEnum.shipping].value).toEqual(null);
   });
 });
diff --git a/libs/cart/driver/magento/src/transforms/outputs/cart.service.spec.ts b/libs/cart/driver/magento/src/transforms/outputs/cart.service.spec.ts
@@ -181,48 +181,13 @@ describe('@daffodil/cart/driver/magento | MagentoCart', () => {
 
       it('should return the expected cart totals', () => {
         const totalTax = mockMagentoCart.prices.applied_taxes.reduce((acc, tax) => (daffAdd(acc, tax.amount.value)), 0);
-        expect(transformedCart.totals).toEqual([
-          {
-            name: DaffCartTotalTypeEnum.grandTotal,
-            label: 'Grand Total',
-            value: mockMagentoCart.prices.grand_total.value,
-          },
-          {
-            name: DaffCartTotalTypeEnum.subtotalExcludingTax,
-            label: 'Subtotal Excluding Tax',
-            value: mockMagentoCart.prices.subtotal_excluding_tax.value,
-          },
-          {
-            name: DaffCartTotalTypeEnum.subtotalIncludingTax,
-            label: 'Subtotal Including Tax',
-            value: mockMagentoCart.prices.subtotal_including_tax.value,
-          },
-          {
-            name: DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax,
-            label: 'Subtotal with Discount Excluding Tax',
-            value: mockMagentoCart.prices.subtotal_with_discount_excluding_tax.value,
-          },
-          {
-            name: DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax,
-            label: 'Subtotal with Discount Including Tax',
-            value: daffAdd(mockMagentoCart.prices.subtotal_with_discount_excluding_tax.value, totalTax),
-          },
-          {
-            name: DaffCartTotalTypeEnum.tax,
-            label: 'Tax',
-            value: totalTax,
-          },
-          ...mockMagentoCart.prices.discounts.map(discount => ({
-            name: DaffCartTotalTypeEnum.discount,
-            label: discount.label,
-            value: discount.amount.value,
-          })),
-          {
-            name: DaffCartTotalTypeEnum.shipping,
-            label: 'Shipping',
-            value: mockMagentoCart.shipping_addresses[0].selected_shipping_method.amount.value,
-          },
-        ]);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.grandTotal].value).toEqual(mockMagentoCart.prices.grand_total.value);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.subtotalExcludingTax].value).toEqual(mockMagentoCart.prices.subtotal_excluding_tax.value);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.subtotalIncludingTax].value).toEqual(mockMagentoCart.prices.subtotal_including_tax.value);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.subtotalWithDiscountExcludingTax].value).toEqual(mockMagentoCart.prices.subtotal_with_discount_excluding_tax.value);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.subtotalWithDiscountIncludingTax].value).toEqual(daffAdd(mockMagentoCart.prices.subtotal_with_discount_excluding_tax.value, totalTax));
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.tax].value).toEqual(totalTax);
+        expect(transformedCart.totals[DaffCartTotalTypeEnum.shipping].value).toEqual(mockMagentoCart.shipping_addresses[0].selected_shipping_method.amount.value);
       });
 
       it('should call the shipping information transformer with the shipping method', () => {

diff --git a/libs/cart/routing/src/guards/billing-address/billing-address.guard.spec.ts b/libs/cart/routing/src/guards/billing-address/billing-address.guard.spec.ts
@@ -52,7 +52,7 @@ describe('Cart | State | Guards | DaffBillingAddressGuard', () => {
 
   describe('canActivate', () => {
     it('should allow activation when there is a billing address', () => {
-      const cart: DaffCart = new DaffCartFactory().create({
+      const cart: DaffCart = TestBed.inject(DaffCartFactory).create({
         billing_address: new DaffCartAddressFactory().create(),
       });
       store.dispatch(new DaffCartLoadSuccess(cart));
@@ -65,7 +65,7 @@ describe('Cart | State | Guards | DaffBillingAddressGuard', () => {
 
       beforeEach(() => {
         spyOn(router, 'navigateByUrl');
-        const cart: DaffCart = new DaffCartFactory().create({
+        const cart: DaffCart = TestBed.inject(DaffCartFactory).create({
           billing_address: null,
         });
         store.dispatch(new DaffCartLoadSuccess(cart));