Merge remote-tracking branch 'origin/MC-41217' into 2.4-develop-sidecar-pr17

Author: zakdma

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml

@@ -41,7 +41,7 @@
             </createData>
 
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value="cataloginventory_stock catalog_product_price"/>
+                <argument name="indices" value=""/>
             </actionGroup>
         </before>
         <after>

app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml

@@ -11,19 +11,25 @@
     <test name="CheckingCountryDropDownWithOneAllowedCountryTest">
         <annotations>
             <features value="Config"/>
-            <stories value="MAGETWO-96107: Additional blank option in country dropdown"/>
+            <stories value="Additional blank option in country dropdown"/>
             <title value="Checking country drop-down with one allowed country"/>
             <description value="Check country drop-down with one allowed country"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-96133"/>
-            <group value="configuration"/>
+            <testCaseId value="MAGETWO-28511"/>
+            <group value="config"/>
         </annotations>
         <before>
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="CustomerEntityOne.email"/>
@@ -47,5 +53,12 @@
         <click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
         <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
         <dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
+        <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+            <argument name="tags" value="config full_page"/>
+        </actionGroup>
+        <reloadPage stepKey="realoadPageAfterConfigChanged"/>
+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeUnitedStatesCountry"/>
+        <see selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="seeBrazilCountry"/>
     </test>
 </tests>