ACP2E-862: Cash on Delivery method is visible even if it is not allowed for that particular country

Author: pradeep1819

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CashOnDeliverySpecificCountryActionGroup.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CashOnDeliverySpecificCountryActionGroup">
+        <annotations>
+            <description>Enable/Disable Cash On Delivery payment method and allow for specific Country.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="path" type="string" defaultValue="{{CashOnDeliveryDisabledConfigData.path}}"/>
+            <argument name="value" type="string" defaultValue="{{CashOnDeliveryDisabledConfigData.value}}"/>
+            <argument name="allowSpecific" type="string" defaultValue="0"/>
+            <argument name="specificCountry" type="string" defaultValue="''"/>
+        </arguments>
+
+        <magentoCLI command="config:set {{path}} {{value}}" stepKey="enableCashOnDelivery"/>
+        <magentoCLI command="config:set payment/cashondelivery/allowspecific {{allowSpecific}}" stepKey="allowSpecificValue"/>
+        <magentoCLI command="config:set payment/cashondelivery/specificcountry {{specificCountry}}" stepKey="specificCountryValue"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

@@ -65,5 +65,6 @@
         <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
         <element name="discount" type="block" selector="tr.totals.discount"/>
         <element name="discountPrice" type="text" selector=".discount .price"/>
+        <element name="billingAddressSameAsShippingCheckboxCod" type="checkbox" selector="#billing-address-same-as-shipping-cashondelivery"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCashOnDeliveryPaymentForSpecificCountryTest.xml

@@ -21,10 +21,12 @@
         </annotations>
         <before>
             <!--Enable Cash On Delivery payment method-->
-            <magentoCLI command="config:set {{CashOnDeliveryEnableConfigData.path}} {{CashOnDeliveryEnableConfigData.value}}" stepKey="enableCashOnDelivery"/>
-            <!--Allow Cash On Delivery for Specific Country-->
-            <magentoCLI command="config:set payment/cashondelivery/allowspecific 1" stepKey="allowSpecificValue"/>
-            <magentoCLI command="config:set payment/cashondelivery/specificcountry GB" stepKey="specificCountryValue"/>
+            <actionGroup ref="CashOnDeliverySpecificCountryActionGroup" stepKey="enableCashOnDelivery">
+                <argument name="path" value="{{CashOnDeliveryEnableConfigData.path}}"/>
+                <argument name="value" value="{{CashOnDeliveryEnableConfigData.value}}"/>
+                <argument name="allowSpecific" value="1"/>
+                <argument name="specificCountry" value="GB"/>
+            </actionGroup>
 
             <!--Create Simple Product-->
             <createData entity="SimpleProduct" stepKey="simpleProduct"/>
@@ -33,10 +35,7 @@
         </before>
         <after>
             <!--Disable Cash On Delivery method-->
-            <magentoCLI command="config:set payment/cashondelivery/allowspecific 0" stepKey="allowSpecificValue"/>
-            <magentoCLI command="config:set payment/cashondelivery/specificcountry ''" stepKey="specificCountryValue"/>
-            <magentoCLI command="config:set {{CashOnDeliveryDisabledConfigData.path}} {{CashOnDeliveryDisabledConfigData.value}}" stepKey="disabledCashOnDelivery"/>
-
+            <actionGroup ref="CashOnDeliverySpecificCountryActionGroup" stepKey="disableCashOnDelivery"/>
             <!--Customer log out-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
             <!--Delete created product-->
@@ -72,20 +71,19 @@
         <waitForPageLoad stepKey="waitForNewAddressPageLoad"/>
 
         <!--Assert COD payment method is available for the specific allowed Country-->
-        <seeElement selector="input#cashondelivery" stepKey="seeCodPaymentMethod"/>
+        <seeElement selector="{{StorefrontCheckoutPaymentMethodsSection.cashOnDelivery}}" stepKey="seeCodPaymentMethod"/>
 
         <!--Select payment method-->
         <click selector="{{StorefrontCheckoutPaymentMethodsSection.cashOnDelivery}}" stepKey="selectCashOnDeliveryMethod"/>
 
         <!--Billing is same as shipping-->
-        <checkOption selector="#billing-address-same-as-shipping-cashondelivery" stepKey="selectPaymentSolution" />
+        <checkOption selector="{{CheckoutPaymentSection.billingAddressSameAsShippingCheckboxCod}}" stepKey="selectPaymentSolution" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
 
         <!--Assert COD payment method not available anymore-->
-        <dontSeeElement selector="input#cashondelivery" stepKey="dontSeeCodPaymentMethod"/>
+        <dontSeeElement selector="{{StorefrontCheckoutPaymentMethodsSection.cashOnDelivery}}" stepKey="dontSeeCodPaymentMethod"/>
 
         <!-- Place order -->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="PlaceOrder" />
     </test>
 </tests>
-

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -125,7 +125,7 @@ function (
         useShippingAddress: function () {
             if (this.isAddressSameAsShipping()) {
                 selectBillingAddress(quote.shippingAddress());
-                this.updateAddresses();
+                this.updateAddresses(true);
                 this.isAddressDetailsVisible(true);
             } else {
                 lastSelectedBillingAddress = quote.billingAddress();
@@ -170,7 +170,7 @@ function (
                     checkoutData.setNewCustomerBillingAddress(addressData);
                 }
             }
-            this.updateAddresses();
+            this.updateAddresses(true);
         },
 
         /**
@@ -242,9 +242,14 @@ function (
 
         /**
          * Trigger action to update shipping and billing addresses
+         *
+         * @param {Boolean} force
          */
-        updateAddresses: function () {
-            setBillingAddressAction(globalMessageList);
+        updateAddresses: function (force = false) {
+            if (force || window.checkoutConfig.reloadOnBillingAddress ||
+                !window.checkoutConfig.displayBillingOnPaymentMethod) {
+                setBillingAddressAction(globalMessageList);
+            }
         },
 
         /**