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/Test/StorefrontCashOnDeliveryPaymentForSpecificCountryTest.xml

@@ -10,16 +10,17 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontCashOnDeliveryPaymentForSpecificCountryTest">
         <annotations>
-            <title value="OnePageCheckout Cash on Delivery method is not visible, if it is not allowed for that specific Country."/>
-            <description value="OnePageCheckout Cash on Delivery method is visible only for the allowed Countries, while disappears if the billing address selected from the not allowed Countries."/>
-            <stories value="OnePageCheckout Cash on Delivery method disappears, if the address changed to the Country which is not allowed for it."/>
+            <title value="OnePageCheckout cash on delivery method available only for the allowed specific Countries."/>
+            <description value="OnePageCheckout cash on delivery method is visible only for the allowed Countries, while disappears if the billing address changed to not allowed Countries."/>
+            <stories value="OnePageCheckout cash on delivery method disappears, if the address changed to the Country which is not allowed for it."/>
             <features value="OnePageCheckout"/>
             <severity value="AVERAGE"/>
             <testCaseId value="AC-3216"/>
             <useCaseId value="ACP2E-862"/>
             <group value="checkout"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{DisplayBillingAddressOnPaymentMethod.path}} {{DisplayBillingAddressOnPaymentMethod.value}}" stepKey="displayBillingAddressOnPaymentMethod"/>
             <!--Enable Cash On Delivery payment method-->
             <magentoCLI command="config:set {{CashOnDeliveryEnableConfigData.path}} {{CashOnDeliveryEnableConfigData.value}}" stepKey="enableCashOnDelivery"/>
             <!--Allow Cash On Delivery for Specific Country-->
@@ -60,7 +61,6 @@
 
         <!-- Select Shipping Method-->
         <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-
         <!--Click next button to open payment section-->
         <actionGroup ref="StorefrontGuestCheckoutProceedToPaymentStepActionGroup" stepKey="clickNext"/>
 
@@ -84,5 +84,9 @@
 
         <!--Assert COD payment method not available anymore-->
         <dontSeeElement selector="input#cashondelivery" stepKey="dontSeeCodPaymentMethod"/>
+
+        <!-- Place order -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="PlaceOrder" />
     </test>
 </tests>
+

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

@@ -237,11 +237,6 @@ function (
          * @return {*}
          */
         getCountryName: function (countryId) {
-            if (lastSelectedBillingAddress && String(lastSelectedBillingAddress['countryId']) !== String(countryId)) {
-                this.updateAddresses();
-            }
-            lastSelectedBillingAddress = quote.billingAddress();
-
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
         },