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

@@ -16,12 +16,12 @@
         <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="''"/>
+            <argument name="allowSpecific" type="string" defaultValue="{{CashOnDeliveryApplicableAllAllowedCountryConfigData.value}}"/>
+            <argument name="specificCountry" type="string" defaultValue="{{CashOnDeliveryAllAllowedCountryConfigData.value}}"/>
         </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"/>
+        <magentoCLI command="config:set {{CashOnDeliveryApplicableAllAllowedCountryConfigData.path}} {{allowSpecific}}" stepKey="allowSpecificValue"/>
+        <magentoCLI command="config:set {{CashOnDeliveryAllAllowedCountryConfigData.path}} {{specificCountry}}" stepKey="specificCountryValue"/>
     </actionGroup>
 </actionGroups>

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

@@ -24,7 +24,7 @@
             <actionGroup ref="CashOnDeliverySpecificCountryActionGroup" stepKey="enableCashOnDelivery">
                 <argument name="path" value="{{CashOnDeliveryEnableConfigData.path}}"/>
                 <argument name="value" value="{{CashOnDeliveryEnableConfigData.value}}"/>
-                <argument name="allowSpecific" value="1"/>
+                <argument name="allowSpecific" value="{{CashOnDeliveryApplicableSpecificCountryConfigData.value}}"/>
                 <argument name="specificCountry" value="GB"/>
             </actionGroup>
 

app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodConfigData.xml

@@ -44,4 +44,22 @@
         <data key="label">No</data>
         <data key="value">0</data>
     </entity>
+    <entity name="CashOnDeliveryApplicableSpecificCountryConfigData">
+        <data key="path">payment/cashondelivery/allowspecific</data>
+        <data key="scope_id">1</data>
+        <data key="label">Specific Countries</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CashOnDeliveryApplicableAllAllowedCountryConfigData">
+        <data key="path">payment/cashondelivery/allowspecific</data>
+        <data key="scope_id">1</data>
+        <data key="label">All Allowed Countries</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="CashOnDeliveryAllAllowedCountryConfigData">
+        <data key="path">payment/cashondelivery/specificcountry</data>
+        <data key="scope_id">1</data>
+        <data key="label">All Allowed Countries</data>
+        <data key="value">''</data>
+    </entity>
 </entities>