ACQE-6648: StorefrontUpdateCustomerAddressBelgiumTest

conflict resolved

Author: nikhilsharma-adobe

app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml

@@ -42,4 +42,9 @@
             <item>United Kingdom</item>
         </array>
     </entity>
+    <entity name="WesternEurope" type="countryArray">
+        <array key="country">
+            <item>Belgium</item>
+        </array>
+    </entity>
 </entities>

app/code/Magento/Checkout/Test/Mftf/Data/StateData.xml

@@ -13,13 +13,13 @@
             <description>Goes to the 'Configuration' page for 'General'. Selects the provided States under 'State is Required for'. Clicks on the Save button.</description>
         </annotations>
         <arguments>
-            <argument name="states" type="entity"/>
+            <argument name="countries" type="entity"/>
         </arguments>
         <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToAdminConfigGeneralPage"/>
         <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
         <waitForAjaxLoad stepKey="waitForAjax"/>
         <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
-        <unselectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{states.state}}]" stepKey="selectCountriesWithRequiredRegion"/>
+        <unselectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" parameterArray="[{{countries.country}}]" stepKey="selectCountriesWithRequiredRegion"/>
         <click selector="#save" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForSavingConfig"/>
     </actionGroup>

app/code/Magento/Config/Test/Mftf/ActionGroup/UnselectStatesForStatesOptionsActionGroup.xml

@@ -21,7 +21,7 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="UnselectStatesForStatesOptionsActionGroup" stepKey="unselectStatesForStatesOptionsActionGroup">
-                <argument name="states" value="States"/>
+                <argument name="countries" value="WesternEurope"/>
             </actionGroup>
             <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
             <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">