MC-40197: [JetTeam] Unskip AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest

Author: oleg-onufer

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

@@ -45,6 +45,6 @@
         <element name="addressFieldValidationError" type="text" selector="div.address div.field .field-error"/>
         <element name="textFieldAttrRequireMessage" type="text" selector="//input[@name='custom_attributes[{{attribute}}]']/ancestor::div[contains(@class, 'control')]/div/span" parameterized="true" timeout="30"/>
         <element name="textFieldAttribute" type="input" selector="[name*='custom_attributes[{{attribute}}]']" parameterized="true" timeout="30"/>
-        <element name="regionFieldIsRequired" type="text" selector="#shipping-new-address-form>div[class='field _required'][name='shippingAddress.region_id']" timeout="30"/>
+        <element name="shippingAddressRequiredField" type="text" selector="//*[@id='shipping-new-address-form']//div[contains(@class, 'field _required') and contains(@name, '{{attribute}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>

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

@@ -26,26 +26,27 @@
         </after>
         <!--Step 1 Add simple product to the cart -->
         <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addProductToCart">
-            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="product" value="$createSimpleProduct$"/>
         </actionGroup>
 
         <!--Step 2 Proceed to Checkout and be on Shipping page -->
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
 
         <!--Step 3 Select Country as United Kingdom and Refresh the page -->
-        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country}}" stepKey="selectCounty"/>
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}" stepKey="selectCounty"/>
         <waitForPageLoad stepKey="waitFormToReload"/>
         <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
         <!-- Assert Selected Country is United States -->
         <seeOptionIsSelected selector="{{CheckoutShippingSection.country}}" userInput="{{US_Address_TX.country}}" stepKey="selectedCountryIsUnitedStates"/>
 
         <!--Step 4 Select Country as United Kingdom, select address street and Refresh the page-->
-        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country}}" stepKey="selectUnitedKingdomCounty"/>
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}" stepKey="selectUnitedKingdomCounty"/>
+        <waitForPageLoad stepKey="waitFormToReloadAfterSelectCountry"/>
         <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="enterAddressStreet"/>
         <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPageAfterAddressIsAdded"/>
         <!-- Assert Entered details should be retained and State/Province field should be displayed as an optional field (without * ) -->
         <seeOptionIsSelected selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country}}" stepKey="selectedCountryIsUnitedKingdom"/>
         <seeInField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="seeAddressStreetUnitedKingdom"/>
-        <dontSeeElement selector="{{CheckoutShippingSection.regionFieldIsRequired}}" stepKey="assertStateProvinceIsNotRequired"/>
+        <dontSeeElement selector="{{CheckoutShippingSection.shippingAddressRequiredField('shippingAddress.region_id')}}" stepKey="assertStateProvinceIsNotRequired"/>
     </test>
 </tests>