PayPal Express in Cart and Mini-Cart page (#1122)

* Rendering PayPal Expres button (#1076) * Paypal express payment (#1077) * Merchant reference set for PayPal Express (#1080) * Populate payment instrument fields for PayPal Express (#1081) * Adding the possibility to enable/disable paypal express from BM (#1085) * feat: adding the possibility to enable/disable paypal ecs from BM * chore: linting * fix: fixing klarna e2e test * PayPal Express update order (#1086) * feat: paypalUpdateOrder endpoint * test: unit tests and jsdoc annotations * feat: paypal update order * feat(SFI-696): show paypal express if enabled in BM * chore(SFI-696): add sonar properties file * refactor(SFI-696): function to create redirectUrl * feat(SFI-696): add stacktrace for error and fatal logs * chore(SFI-696): exclude e2e tests from sonar * fix(SFI-696): clear session.privacy data for paypal express * chore(SFI-696): undo changes to cartridges * fix(SFI-696): zero-auth flow * add spinner for paypal express flow (#1091) * Added the review page template and controller to render it (#1096) * Place order button for express payments on review page (#1112) * feat(SFI-790): new template for checkout review button * feat(SFI-789): handle payments details call from checkout review page * feat(SFI-789): create basket view data on express review page * feat(SFI-789): create basket view data on express review page * chore: merging develop into SFI-42 and adding required mocks (#1115) * Added e2e tests for paypal express (#1117) * test(SFI-798): paypal express unit tests (#1121) * fix: fixing apple pay express flow --------- Co-authored-by: Shani <[email protected]>
Adyen · Jul 23, 2024 · 5b1cfd4 · 5b1cfd4
1 parent 1133168
commit 5b1cfd4
Show file tree

Hide file tree

Showing 65 changed files with 3,311 additions and 789 deletions.
diff --git a/.github/workflows/SFCC.yml b/.github/workflows/SFCC.yml
@@ -22,6 +22,6 @@ jobs:
           npm install
           npm run lint:fix
           npm run lint
-          npm test
+          npm run test:coverage
         env:
           CI: true
diff --git a/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/shippingMethods.js b/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/shippingMethods.js
@@ -61,4 +61,4 @@ function callGetShippingMethods(req, res, next) {
     return next();
   }
 }
-module.exports = callGetShippingMethods;
+module.exports = callGetShippingMethods;
diff --git a/jest/__mocks__/dw/order/BasketMgr.js b/jest/__mocks__/dw/order/BasketMgr.js
@@ -36,6 +36,11 @@ export const getTotalGrossPrice = jest.fn(() => ({
   isAvailable,
 }));
 
+export const getAdjustedMerchandizeTotalGrossPrice = jest.fn(() => ({
+  currencyCode: 'EUR',
+  isAvailable,
+}));
+
 export const getCreditCardToken = jest.fn(() => 'mockedCreditCardToken');
 export const getPaymentMethod = jest.fn(() => 'mockedPaymentMethod');
 
@@ -47,8 +52,14 @@ export const setCreditCardToken = jest.fn();
 
 export const toArray = jest.fn(() => [
   {
-    custom: {},
-    paymentTransaction: { paymentProcessor: 'mocked_payment_processor' },
+    custom: { adyenPaymentMethod: '' },
+    paymentTransaction: {
+      paymentProcessor: 'mocked_payment_processor',
+      amount: {
+        value: 'mockedValue',
+        currencyCode: 'mockedValue',
+      },
+    },
     setCreditCardNumber,
     setCreditCardType,
     setCreditCardExpirationMonth,
@@ -73,7 +84,6 @@ export const getDefaultShipment = jest.fn(() => ({
 }));
 export const getBillingAddress = jest.fn(() => 'mocked_billing_address');
 
-
 function formatCustomerObject(shopperDetails) {
   return {
     addressBook: {
@@ -121,7 +131,9 @@ export const getCurrentBasket = jest.fn(() => ({
   setCustomerEmail: jest.fn(),
   getAllProductLineItems,
   getTotalGrossPrice,
+  getAdjustedMerchandizeTotalGrossPrice,
   getPaymentInstruments,
+  removeAllPaymentInstruments: jest.fn(),
   removePaymentInstrument: jest.fn(),
   custom: {
     amazonExpressShopperDetails: JSON.stringify({
@@ -138,15 +150,15 @@ export const getCurrentBasket = jest.fn(() => ({
       },
       addressBook: {
         preferredAddress: {
-            address1: 'address1',
-            address2: 'mocked address2',
-            phone: 'mocked phone',
-            postalCode: 'mocked postalCode',
-            countryCode: 'mocked CC',
-            city: 'mocked city',
-            lastName: 'mocked name',
-            firstName: 'mocked name',
-            stateCode: 'mocked state',
+          address1: 'address1',
+          address2: 'mocked address2',
+          phone: 'mocked phone',
+          postalCode: 'mocked postalCode',
+          countryCode: 'mocked CC',
+          city: 'mocked city',
+          lastName: 'mocked name',
+          firstName: 'mocked name',
+          stateCode: 'mocked state',
         },
       },
       profile: {
@@ -158,7 +170,7 @@ export const getCurrentBasket = jest.fn(() => ({
     }),
   },
   getUUID: jest.fn(),
-  createBillingAddress,
+  createBillingAddress: jest.fn(() => createBillingAddress),
   createPaymentInstrument: jest.fn(() => toArray()[0]),
   defaultShipment: getDefaultShipment(),
   getDefaultShipment,

diff --git a/jest/__mocks__/dw/order/OrderMgr.js b/jest/__mocks__/dw/order/OrderMgr.js
@@ -1,16 +1,16 @@
 const paymentInstrument = () => [
   {
     custom: {
-      adyenPaymentData: "{ \"paymentMethod\": { \"type\": \"mocked_type\" } }",
+      adyenPaymentData: '{ "paymentMethod": { "type": "mocked_type" } }',
       adyenRedirectURL: 'https://some_mocked_url/signature',
       adyenMD: 'mocked_adyen_MD',
       adyenAction: 'mocked_adyen_action',
     },
     paymentTransaction: {
-        custom: {
-            Adyen_merchantSig: 'mocked_signature',
-            Adyen_authResult: "{ \"data\": \"mock\"}",
-        },
+      custom: {
+        Adyen_merchantSig: 'mocked_signature',
+        Adyen_authResult: '{ "data": "mock"}',
+      },
     },
   },
 ];
@@ -36,20 +36,31 @@ export const getPaymentInstruments = jest.fn(() => ({
   0: toArray()[0],
 }));
 
-
-
-export const getOrder = jest.fn((statusValue="4"/* orderNo */) => ({
+export const getOrder = jest.fn((statusValue = '4' /* orderNo */) => ({
   getPaymentInstruments,
   setPaymentStatus: jest.fn(),
   setExportStatus: jest.fn(),
   orderNo: 'mocked_orderNo',
   orderToken: 'mocked_orderToken',
   getUUID: jest.fn(),
   custom: { Adyen_pspReference: 'mocked_pspRef' },
-  status: { value: statusValue}
+  status: { value: statusValue },
 }));
 
 export const failOrder = jest.fn((orderNo, bool) => ({
   orderNo,
   bool,
 }));
+
+export const createOrderNo = jest.fn(() => 'mocked_orderNo');
+
+export const createOrder = jest.fn(() => ({
+  getPaymentInstruments,
+  setPaymentStatus: jest.fn(),
+  setExportStatus: jest.fn(),
+  orderNo: 'mocked_orderNo',
+  orderToken: 'mocked_orderToken',
+  getUUID: jest.fn(),
+  custom: { Adyen_pspReference: 'mocked_pspRef' },
+  status: { value: 'Created' },
+}));
diff --git a/jest/__mocks__/dw/order/ShippingLocation.js b/jest/__mocks__/dw/order/ShippingLocation.js
@@ -0,0 +1,5 @@
+function ShippingLocation() {
+  return jest.fn();
+}
+
+module.exports = ShippingLocation;
diff --git a/jest/__mocks__/dw/order/ShippingMgr.js b/jest/__mocks__/dw/order/ShippingMgr.js
@@ -1,6 +1,40 @@
+const Money = require('../value/Money');
 
-  export const getShipmentShippingModel = jest.fn((shipment) => ({
-    getApplicableShippingMethods: jest.fn(() => ({
-    })),
-  }));
-
+const shippingMethods = [
+  {
+    description: 'Order received within 7-10 business days',
+    displayName: 'Ground',
+    ID: '001',
+    custom: {
+      estimatedArrivalTime: '7-10 Business Days',
+    },
+    getTaxClassID: jest.fn(),
+  },
+  {
+    description: 'Order received in 2 business days',
+    displayName: '2-Day Express',
+    ID: '002',
+    shippingCost: '$0.00',
+    custom: {
+      estimatedArrivalTime: '2 Business Days',
+    },
+    getTaxClassID: jest.fn(),
+  },
+];
+const shippingCost = Money();
+const shipmentShippingModel = {
+  getApplicableShippingMethods: jest.fn(() => ({
+    toArray: jest.fn(() => shippingMethods),
+  })),
+  getShippingCost: jest.fn(() => ({
+    getAmount: jest.fn(() => shippingCost),
+  })),
+};
+const productShippingModel = {
+  getApplicableShippingMethods: jest.fn(() => ({})),
+  getShippingCost: jest.fn(() => ({
+    getAmount: jest.fn(() => shippingCost),
+  })),
+};
+export const getShipmentShippingModel = jest.fn(() => shipmentShippingModel);
+export const getProductShippingModel = jest.fn(() => productShippingModel);
diff --git a/jest/__mocks__/dw/order/TaxMgr.js b/jest/__mocks__/dw/order/TaxMgr.js
@@ -0,0 +1,2 @@
+export const getTaxJurisdictionID = jest.fn();
+export const getTaxRate = jest.fn();
diff --git a/jest/__mocks__/dw/util/UUIDUtils.js b/jest/__mocks__/dw/util/UUIDUtils.js
@@ -1 +1 @@
-export const createUUID = jest.fn();
+export const createUUID = jest.fn(() => 'mock_UUID');
diff --git a/jest/__mocks__/dw/value/Money.js b/jest/__mocks__/dw/value/Money.js
@@ -1,5 +1,30 @@
-export class Money {
-  constructor() {
-    return {value: 10, currency: 'TEST'};
-  }
- }
+function Money(isAvailable) {
+  return {
+    available: isAvailable,
+    value: '10.99',
+    currency: 'USD',
+    getDecimalValue() {
+      return '10.99';
+    },
+    getValue() {
+      return '10.99';
+    },
+    getCurrencyCode() {
+      return 'USD';
+    },
+    subtract() {
+      return new Money(isAvailable);
+    },
+    multiply() {
+      return new Money(isAvailable);
+    },
+    add() {
+      return new Money(isAvailable);
+    },
+    addRate() {
+      return new Money(isAvailable);
+    },
+  };
+}
+
+module.exports = Money;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const getTaxJurisdictionID = jest.fn();
		export const getTaxRate = jest.fn();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const createUUID = jest.fn();
		export const createUUID = jest.fn(() => 'mock_UUID');