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

@@ -15,7 +15,7 @@
             <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=""/>
+            <testCaseId value="AC-3216"/>
             <useCaseId value="ACP2E-862"/>
             <group value="checkout"/>
         </annotations>
@@ -27,7 +27,7 @@
             <magentoCLI command="config:set payment/cashondelivery/specificcountry GB" stepKey="specificCountryValue"/>
 
             <!--Create Simple Product-->
-            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct"/>
             <!--Create Customer-->
             <createData entity="Simple_US_Customer_US_UK_Addresses" stepKey="createCustomer"/>
         </before>
@@ -40,7 +40,7 @@
             <!--Customer log out-->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
             <!--Delete created product-->
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <!--Delete Customer-->
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
@@ -50,17 +50,13 @@
             <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>
 
-        <!--Add Simple Product to cart-->
-        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
-        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        <!--Add Simple Product to Shopping Cart and Proceed to checkout-->
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="amOnSimpleProductPage"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="productCount" value="1"/>
         </actionGroup>
-
-        <!--Go to Cart and click 'Proceed To Checkout' button-->
-        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartPage"/>
-        <actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="clickProceedToCheckout"/>
-        <waitForElement selector="{{CheckoutShippingSection.shippingTab}}" stepKey="waitForCheckoutPage"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
 
         <!-- Select Shipping Method-->
         <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>

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

@@ -124,9 +124,13 @@ function (
          */
         useShippingAddress: function () {
             if (this.isAddressSameAsShipping()) {
+                addressUpadated = true;
+
                 selectBillingAddress(quote.shippingAddress());
+                checkoutData.setSelectedBillingAddress(quote.shippingAddress().getKey());
+                setBillingAddressAction(globalMessageList);
 
-                this.updateAddress();
+                this.updateAddresses();
                 this.isAddressDetailsVisible(true);
             } else {
                 lastSelectedBillingAddress = quote.billingAddress();
@@ -146,10 +150,7 @@ function (
 
             addressUpadated = true;
 
-            if (this.isAddressSameAsShipping()) {
-                selectBillingAddress(quote.shippingAddress());
-                checkoutData.setSelectedBillingAddress(quote.shippingAddress().getKey());
-            } else if (this.selectedAddress() && !this.isAddressFormVisible()) {
+            if (this.selectedAddress() && !this.isAddressFormVisible()) {
                 selectBillingAddress(this.selectedAddress());
                 checkoutData.setSelectedBillingAddress(this.selectedAddress().getKey());
             } else {