Merge branch 'feat-#49/shipping-billing' into feat-#56/payment-provider

packages/api-client/__tests__/api/addToCart.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] addToCart', () => {
 
     const { data } = await addToCart(context, { productVariantId: '1', quantity: 1});
 
-    expect(data).toBe('add to cart response');
+    const expectedAddToCart = 'add to cart response';
+
+    expect(data).toBe(expectedAddToCart);
   });
 });

packages/api-client/__tests__/api/applyCartCoupon.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] applyCartCoupon', () => {
 
     const { data } = await applyCartCoupon(context, { couponCode: '1'});
 
-    expect(data).toBe('apply cart coupon response');
+    const expectedApplyCoupon = 'apply cart coupon response';
+
+    expect(data).toBe(expectedApplyCoupon);
   });
 });

packages/api-client/__tests__/api/getCart.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] getCart', () => {
 
     const { data } = await getCart(context, {});
 
-    expect(data).toBe('get cart response');
+    const expectedGetCartResponse = 'get cart response';
+
+    expect(data).toBe(expectedGetCartResponse);
   });
 });

packages/api-client/__tests__/api/getCategory.spec.ts

@@ -23,6 +23,8 @@ describe('[vendure-api-client] getCategory', () => {
 
     const { data } = await getCategory(context, { options: {}});
 
-    expect(data).toBe('category response');
+    const expectedGetCategory = 'category response';
+
+    expect(data).toBe(expectedGetCategory);
   });
 });

packages/api-client/__tests__/api/getFacet.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] getFacet', () => {
 
     const { data } = await getFacet(context, {});
 
-    expect(data).toBe('facet response');
+    const expectedGetFacet = 'facet response';
+
+    expect(data).toBe(expectedGetFacet);
   });
 });

packages/api-client/__tests__/api/getMe.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] getMe', () => {
 
     const { data } = await getMe(context);
 
-    expect(data).toBe('get me response');
+    const expectedGetMe = 'get me response';
+
+    expect(data).toBe(expectedGetMe);
   });
 });

packages/api-client/__tests__/api/getProduct.spec.ts

@@ -24,6 +24,8 @@ describe('[vendure-api-client] getProduct', () => {
 
     const { data } = await getProduct(context, { id: '1', slug: 'laptop' });
 
-    expect(data).toBe('product response');
+    const expectedGetProduct = 'product response';
+
+    expect(data).toBe(expectedGetProduct);
   });
 });

packages/api-client/__tests__/api/getShippingMethods.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] getShippingMethods', () => {
 
     const { data } = await getShippingMethods(context);
 
-    expect(data).toBe('get shipping methods response');
+    const expectedGetShippingMethods = 'get shipping methods response';
+
+    expect(data).toBe(expectedGetShippingMethods);
   });
 });

packages/api-client/__tests__/api/removeCartCoupon.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] removeCartCoupon', () => {
 
     const { data } = await removeCartCoupon(context, { couponCode: '1'});
 
-    expect(data).toBe('remove cart coupon response');
+    const expectedRemoveCartCoupon = 'remove cart coupon response';
+
+    expect(data).toBe(expectedRemoveCartCoupon);
   });
 });

packages/api-client/__tests__/api/removeFromCart.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] removeFromCart', () => {
 
     const { data } = await removeFromCart(context, { orderLineId: '1'});
 
-    expect(data).toBe('remove from cart response');
+    const expectedRemoveFromCart = 'remove from cart response';
+
+    expect(data).toBe(expectedRemoveFromCart);
   });
 });

packages/api-client/__tests__/api/setShippingMethod.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] setShippingMethod', () => {
 
     const { data } = await setShippingMethod(context, { shippingMethodId: '1' });
 
-    expect(data).toBe('set shipping method response');
+    const expectedShippingMethod = 'set shipping method response';
+
+    expect(data).toBe(expectedShippingMethod);
   });
 });

packages/api-client/__tests__/api/updateAddressDetails.spec.ts

@@ -37,7 +37,9 @@ describe('[vendure-api-client] updateAddressDetails', () => {
 
     const { data } = await updateAddressDetails(context, { input: givenVariables.input });
 
-    expect(data).toBe('update shipping details response');
+    const expectedShippingDetails = 'update shipping details response';
+
+    expect(data).toBe(expectedShippingDetails);
   });
 
   it('updates billing details', async () => {
@@ -72,6 +74,8 @@ describe('[vendure-api-client] updateAddressDetails', () => {
 
     const { data } = await updateAddressDetails(context, { input: givenVariables.input, type: BILLING_TYPE });
 
-    expect(data).toBe('update billing details response');
+    const expectedBillingDetails = 'update billing details response';
+
+    expect(data).toBe(expectedBillingDetails);
   });
 });

packages/api-client/__tests__/api/updateCartQuantity.spec.ts

@@ -21,6 +21,8 @@ describe('[vendure-api-client] updateCartQuantity', () => {
 
     const { data } = await updateCartQuantity(context, { orderLineId: '1', quantity: 1});
 
-    expect(data).toBe('update cart quantity response');
+    const expectedUpdateCartQuantity = 'update cart quantity response';
+
+    expect(data).toBe(expectedUpdateCartQuantity);
   });
 });

packages/api-client/src/api/addToCart/index.ts

@@ -2,6 +2,7 @@ import addItemToOrderMutation from './addItemToOrderMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { AddToCartParams, AddToCartResponse, Context } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const addToCart = async (context: Context, params: AddToCartParams, customQuery?: CustomQuery): Promise<AddToCartResponse> => {
   const addToCartVariables = {
@@ -15,7 +16,7 @@ const addToCart = async (context: Context, params: AddToCartParams, customQuery?
   const request = await context.client.mutate({
     mutation: gql`${addItemToOrder.query}`,
     variables: addItemToOrder.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as AddToCartResponse;
 
   return request;

packages/api-client/src/api/applyCartCoupon/index.ts

@@ -2,6 +2,7 @@ import applyCouponCodeMutation from './applyCouponCodeMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { CartCouponParams, ApplyCouponCodeResponse, Context } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const applyCartCoupon = async (context: Context, params: CartCouponParams, customQuery?: CustomQuery): Promise<ApplyCouponCodeResponse> => {
   const applyCartCouponVariables = {
@@ -15,7 +16,7 @@ const applyCartCoupon = async (context: Context, params: CartCouponParams, custo
   const request = await context.client.mutate({
     mutation: gql`${applyCouponCode.query}`,
     variables: applyCouponCode.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as ApplyCouponCodeResponse;
 
   return request;

packages/api-client/src/api/getCart/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import activeOrderQuery from './activeOrderQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import { Context, RequestDataStructure, GetCartResponse, Order } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const getCart = async (context: Context, customQuery?: CustomQuery): Promise<GetCartResponse> => {
   const getCartVariables = {};
@@ -13,7 +14,7 @@ const getCart = async (context: Context, customQuery?: CustomQuery): Promise<Get
   const request = await context.client.query<RequestDataStructure<'activeOrder', Order>>({
     query: gql`${activeOrder.query}`,
     variables: activeOrder.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
   return request;
 

packages/api-client/src/api/getCategory/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import collectionsQuery from './collectionsQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import type { CollectionList, CollectionParams, Context, GetCategoryResponse, RequestDataStructure } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const getCategory = async (context: Context, params: CollectionParams, customQuery?: CustomQuery): Promise<GetCategoryResponse> => {
   const collectionsVariables = {
@@ -15,7 +16,7 @@ const getCategory = async (context: Context, params: CollectionParams, customQue
   const request = await context.client.query<RequestDataStructure<'collections', CollectionList>>({
     query: gql`${collections.query}`,
     variables: collections.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
 
   return request;

packages/api-client/src/api/getFacet/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import searchQuery from './searchQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import type { Context, GetFacetResponse, RequestDataStructure, SearchParams, SearchResponse } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 // TODO: Later refactor this to useSearch instead. useFacet will be deprecated soon
 const getFacet = async (context: Context, params: SearchParams, customQuery?: CustomQuery): Promise<GetFacetResponse> => {
@@ -16,7 +17,7 @@ const getFacet = async (context: Context, params: SearchParams, customQuery?: Cu
   const request = await context.client.query<RequestDataStructure<'search', SearchResponse>>({
     query: gql`${search.query}`,
     variables: search.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
 
   return request;

packages/api-client/src/api/getMe/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import activeCustomerQuery from './activeCustomerQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import { Context, RequestDataStructure, GetMeResponse, Customer } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const getMe = async (context: Context, customQuery?: CustomQuery): Promise<GetMeResponse> => {
   const getMeVariables = {};
@@ -13,7 +14,7 @@ const getMe = async (context: Context, customQuery?: CustomQuery): Promise<GetMe
   const request = await context.client.query<RequestDataStructure<'activeCustomer', Customer>>({
     query: gql`${getMe.query}`,
     variables: getMe.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
   return request;
 

packages/api-client/src/api/getProduct/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import productQuery from './productQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import { Context, ProductParams, Product, GetProductResponse, RequestDataStructure } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const getProduct = async (context: Context, params: ProductParams, customQuery?: CustomQuery): Promise<GetProductResponse> => {
   const productVariables = {
@@ -15,7 +16,7 @@ const getProduct = async (context: Context, params: ProductParams, customQuery?:
   const request = await context.client.query<RequestDataStructure<'product', Product>>({
     query: gql`${product.query}`,
     variables: product.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
   return request;
 

packages/api-client/src/api/getShippingMethods/index.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag';
 import eligibleShippingMethodsQuery from './eligibleShippingMethodsQuery';
 import { CustomQuery } from '@vue-storefront/core';
 import { Context, RequestDataStructure, GetShippingMethodsResponse, ShippingMethodQuote } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const getShippingMethods = async (context: Context, customQuery?: CustomQuery): Promise<GetShippingMethodsResponse> => {
   const getShippingMethods = {};
@@ -13,7 +14,7 @@ const getShippingMethods = async (context: Context, customQuery?: CustomQuery):
   const request = await context.client.query<RequestDataStructure<'eligibleShippingMethods', ShippingMethodQuote[]>>({
     query: gql`${eligibleShippingMethods.query}`,
     variables: eligibleShippingMethods.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   });
   return request;
 

packages/api-client/src/api/removeCartCoupon/index.ts

@@ -2,6 +2,7 @@ import removeCouponCodeMutation from './removeCouponCodeMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { CartCouponParams, Context, RemoveCouponCodeResponse } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const removeCartCoupon = async (context: Context, params: CartCouponParams, customQuery?: CustomQuery): Promise<RemoveCouponCodeResponse> => {
   const removeCartCouponVariables = {
@@ -15,7 +16,7 @@ const removeCartCoupon = async (context: Context, params: CartCouponParams, cust
   const request = await context.client.mutate({
     mutation: gql`${removeCouponCode.query}`,
     variables: removeCouponCode.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as RemoveCouponCodeResponse;
 
   return request;

packages/api-client/src/api/removeFromCart/index.ts

@@ -2,6 +2,7 @@ import removeOrderLineMutation from './removeOrderLineMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { Context, RemoveFromCartParams, RemoveFromCartResponse } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const removeFromCart = async (context: Context, params: RemoveFromCartParams, customQuery?: CustomQuery): Promise<RemoveFromCartResponse> => {
   const removeFromCartVariables = {
@@ -15,7 +16,7 @@ const removeFromCart = async (context: Context, params: RemoveFromCartParams, cu
   const request = await context.client.mutate({
     mutation: gql`${removeOrderLine.query}`,
     variables: removeOrderLine.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as RemoveFromCartResponse;
 
   return request;

packages/api-client/src/api/setShippingMethod/index.ts

@@ -2,6 +2,7 @@ import setOrderShippingMethodMutation from './setOrderShippingMethodMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { Context, SetShippingMethodParams, SetShippingMethodResponse } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const setShippingMethod = async (context: Context, params: SetShippingMethodParams, customQuery?: CustomQuery): Promise<SetShippingMethodResponse> => {
   const setShippingMethodVariables = {
@@ -15,7 +16,7 @@ const setShippingMethod = async (context: Context, params: SetShippingMethodPara
   const request = await context.client.mutate({
     mutation: gql`${setOrderShippingMethod.query}`,
     variables: setOrderShippingMethod.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as SetShippingMethodResponse;
 
   return request;

packages/api-client/src/api/updateAddressDetails/index.ts

@@ -3,8 +3,7 @@ import setOrderShippingAddressMutation from './setOrderShippingAddressMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { Context, Order, UpdateAddressDetailsParams, UpdateAddressDetailsResponse } from '../../types';
-import { ARRANGING_PAYMENT_STATE, BILLING_TYPE } from '../../helpers';
-import { isCustomerDataFilled } from '../../helpers';
+import { ARRANGING_PAYMENT_STATE, BILLING_TYPE, NO_CACHE_FETCH_POLICY, isCustomerDataFilled } from '../../helpers';
 import transitionOrderToState from '../transitionOrderToState';
 
 const updateAddressDetails = async (context: Context, params: UpdateAddressDetailsParams, customQuery?: CustomQuery): Promise<UpdateAddressDetailsResponse> => {
@@ -21,7 +20,7 @@ const updateAddressDetails = async (context: Context, params: UpdateAddressDetai
   const request = await context.client.mutate({
     mutation: gql`${updateAddressDetails.query}`,
     variables: updateAddressDetails.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as UpdateAddressDetailsResponse;
 
   if (isBilling && isCustomerDataFilled(request?.data?.setOrderBillingAddress as Order)) {

packages/api-client/src/api/updateCartQuantity/index.ts

@@ -2,6 +2,7 @@ import adjustOrderLineMutation from './adjustOrderLineMutation';
 import { CustomQuery } from '@vue-storefront/core';
 import gql from 'graphql-tag';
 import { Context, UpdateCartParams, UpdateCartQuantityResponse } from '../../types';
+import { NO_CACHE_FETCH_POLICY } from '../../helpers/constants';
 
 const updateCartQuantity = async (context: Context, params: UpdateCartParams, customQuery?: CustomQuery): Promise<UpdateCartQuantityResponse> => {
   const updateCartQuantityVariables = {
@@ -15,7 +16,7 @@ const updateCartQuantity = async (context: Context, params: UpdateCartParams, cu
   const request = await context.client.mutate({
     mutation: gql`${adjustOrderLine.query}`,
     variables: adjustOrderLine.variables,
-    fetchPolicy: 'no-cache'
+    fetchPolicy: NO_CACHE_FETCH_POLICY
   }) as UpdateCartQuantityResponse;
 
   return request;

packages/api-client/src/helpers/constants.ts

@@ -1,3 +1,4 @@
 export const VENDURE_AUTH_TOKEN_NAME = 'vendure-auth-token';
 export const BILLING_TYPE = 'billing';
 export const ARRANGING_PAYMENT_STATE = 'ArrangingPayment';
+export const NO_CACHE_FETCH_POLICY = 'no-cache';

packages/composables/__tests__/getters/cartHelpers.spec.ts

@@ -1,4 +1,4 @@
-import { mockedCart } from '../mocks';
+import { mockedCart } from '../__mocks__';
 import { cartGetters } from './../../src/getters/cartGetters';
 import * as utils from './../../src/helpers/_utils';
 

packages/composables/__tests__/getters/categoryHelpers.spec.ts

@@ -1,4 +1,4 @@
-import { mockedCollectionList } from '../mocks';
+import { mockedCollectionList } from '../__mocks__';
 import { categoryGetters } from './../../src/getters/categoryGetters';
 
 describe('[vendure-getters] category helpers', () => {

packages/composables/__tests__/getters/productHelpers.spec.ts

@@ -1,4 +1,4 @@
-import { mockedAllProductVariants, mockedOptions, mockedProduct, mockedProductVariant } from '../mocks';
+import { mockedAllProductVariants, mockedOptions, mockedProduct, mockedProductVariant } from '../__mocks__';
 import { productGetters } from './../../src/getters/productGetters';
 import * as utils from './../../src/helpers/_utils';
 

packages/composables/__tests__/useBilling/useBilling.spec.ts

@@ -64,7 +64,6 @@ describe('[vendure-composables] useBilling', () => {
     const response = await load(context, {});
 
     expect(response).toBe(loadedBillingAddress);
-    expect(context.cart.load).not.toHaveBeenCalled();
   });
 
   it('saves billing details, updates cart and returns billing details', async () => {