feat: enabling new web component version, with new upi flow and e2e

Adyen · Oct 4, 2024 · 130706d · 130706d
1 parent 8f764d9
commit 130706d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git a/...ridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js b/...ridges/app_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js
@@ -277,11 +277,7 @@ function getGiftCardConfig() {
 }
 
 function handleOnChange(state) {
-  let { type } = state.data.paymentMethod;
-  const multipleTxVariantComponents = constants.MULTIPLE_TX_VARIANTS_COMPONENTS;
-  if (multipleTxVariantComponents.includes(store.selectedMethod)) {
-    type = store.selectedMethod;
-  }
+  const { type } = state.data.paymentMethod;
   store.isValid = state.isValid;
   if (!store.componentsObj[type]) {
     store.componentsObj[type] = {};

diff --git a/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/constants.js b/src/cartridges/app_adyen_SFRA/cartridge/client/default/js/constants.js
@@ -23,6 +23,6 @@ module.exports = {
     'amazonpay',
     'applepay',
     'cashapp',
+    'upi',
   ],
-  MULTIPLE_TX_VARIANTS_COMPONENTS: ['upi'],
 };
diff --git a/src/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js b/src/cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js
@@ -35,7 +35,7 @@ module.exports = {
     PAYPAL: 'paypal',
   },
 
-  CAN_SKIP_SUMMARY_PAGE: ['applepay', 'cashapp'],
+  CAN_SKIP_SUMMARY_PAGE: ['applepay', 'cashapp', 'upi'],
 
   SERVICE: {
     PAYMENT: 'AdyenPayment',
@@ -100,6 +100,6 @@ module.exports = {
   APPLE_DOMAIN_URL:
     '/.well-known/apple-developer-merchantid-domain-association',
 
-  CHECKOUT_COMPONENT_VERSION: '5.65.0',
+  CHECKOUT_COMPONENT_VERSION: '5.68.0',
   VERSION: '24.4.0',
 };
diff --git a/tests/playwright/fixtures/INR.spec.mjs b/tests/playwright/fixtures/INR.spec.mjs
@@ -25,21 +25,18 @@ for (const environment of environments) {
     test('UPI Success', async ({ page }) => {
       redirectShopper = new RedirectShopper(page);
       await redirectShopper.doUPIPayment('upi_collect');
-      await checkoutPage.completeCheckout();
       await checkoutPage.isPaymentModalShown("upi_collect");
     });
 
     test('UPI Failure', async ({ page }) => {
       redirectShopper = new RedirectShopper(page);
       await redirectShopper.doUPIPayment('upi_collect', false);
-      await checkoutPage.completeCheckout();
       await checkoutPage.expectRefusal();
     });
 
     test('UPI QR Success @quick', async ({ page }) => {
       redirectShopper = new RedirectShopper(page);
       await redirectShopper.doUPIPayment('upi_qr');
-      await checkoutPage.completeCheckout();
       await checkoutPage.isPaymentModalShown("Scan QR code");
     });
   });

diff --git a/tests/playwright/pages/CheckoutPageSFRA5.mjs b/tests/playwright/pages/CheckoutPageSFRA5.mjs
@@ -78,7 +78,7 @@ export default class CheckoutPageSFRA5 {
     this.passwordField = page.locator('#login-form-password');
     this.loginButton = page.locator('.login button[type="submit"]');
 
-    this.paymentModal = page.locator("#action-modal #adyenModalDialog");
+    this.paymentModal = page.locator(".additionalFields");
 
     this.donationAmountButton = page.locator('.adyen-checkout__button').nth(0);
     this.donationButton = page.locator('.adyen-checkout__button--donate');

diff --git a/tests/playwright/pages/CheckoutPageSFRA6.mjs b/tests/playwright/pages/CheckoutPageSFRA6.mjs
@@ -80,7 +80,7 @@ export default class CheckoutPageSFRA {
     this.passwordField = page.locator('#login-form-password');
     this.loginButton = page.locator('.login button[type="submit"]');
 
-    this.paymentModal = page.locator("#action-modal #adyenModalDialog");
+    this.paymentModal = page.locator(".additionalFields");
 
     this.donationAmountButton = page.locator('.adyen-checkout__button').nth(0);
     this.donationButton = page.locator('.adyen-checkout__button--donate');

diff --git a/tests/playwright/pages/PaymentMethodsPage.mjs b/tests/playwright/pages/PaymentMethodsPage.mjs
@@ -169,6 +169,7 @@ export default class PaymentMethodsPage {
   };
 
   initiateUPIPayment = async (paymentMethod, success = true) => {
+    const continueButton = this.page.locator(".adyen-checkout__button--pay");
     await this.page.locator(`#rb_upi`).click();
     if (paymentMethod == "upi_collect") {
       await this.page.locator("#upi-button-vpa").click();
@@ -179,6 +180,7 @@ export default class PaymentMethodsPage {
     if (paymentMethod == "upi_qr") {
       await this.page.locator("#upi-button-qrCode").click();
     }
+    await continueButton.click();
   };
 
 

diff --git a/tests/playwright/paymentFlows/redirectShopper.mjs b/tests/playwright/paymentFlows/redirectShopper.mjs
@@ -98,7 +98,7 @@ export class RedirectShopper {
     await this.page.fill('input[name="dateOfBirth"]', '1980-01-11');
     await this.page.fill('input[name="shopperEmail"]', email);
     // There is no static locator to click the checkbox
-    await this.page.locator('label:has-text("Ich stimme den")').click();
+    await this.page.locator('label:has-text("Ich bin mit")').click();
 };
 
   completeGiropayRedirect = async (success) => {