Skip to content

Commit 866babf

Browse files
committed
Merge remote-tracking branch 'origin/MC-41217' into 2.4-develop-sidecar-pr17
2 parents 67ba899 + 0415e64 commit 866babf

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</createData>
4242

4343
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
44-
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
44+
<argument name="indices" value=""/>
4545
</actionGroup>
4646
</before>
4747
<after>

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,25 @@
1111
<test name="CheckingCountryDropDownWithOneAllowedCountryTest">
1212
<annotations>
1313
<features value="Config"/>
14-
<stories value="MAGETWO-96107: Additional blank option in country dropdown"/>
14+
<stories value="Additional blank option in country dropdown"/>
1515
<title value="Checking country drop-down with one allowed country"/>
1616
<description value="Check country drop-down with one allowed country"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MAGETWO-96133"/>
19-
<group value="configuration"/>
18+
<testCaseId value="MAGETWO-28511"/>
19+
<group value="config"/>
2020
</annotations>
2121
<before>
2222
<createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
23+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
24+
<argument name="tags" value="config full_page"/>
25+
</actionGroup>
2326
</before>
2427
<after>
2528
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
2629
<createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
30+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
31+
<argument name="tags" value="config full_page"/>
32+
</actionGroup>
2733
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2834
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
2935
<argument name="customerEmail" value="CustomerEntityOne.email"/>
@@ -47,5 +53,12 @@
4753
<click selector="{{StorefrontCustomerAddressSection.country}}" stepKey="clickToExpandCountryDropDown"/>
4854
<see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeSelectedCountry"/>
4955
<dontSee selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="canNotSeeSelectedCountry"/>
56+
<createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
57+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
58+
<argument name="tags" value="config full_page"/>
59+
</actionGroup>
60+
<reloadPage stepKey="realoadPageAfterConfigChanged"/>
61+
<see selector="{{StorefrontCustomerAddressSection.country}}" userInput="United States" stepKey="seeUnitedStatesCountry"/>
62+
<see selector="{{StorefrontCustomerAddressSection.country}}" userInput="Brazil" stepKey="seeBrazilCountry"/>
5063
</test>
5164
</tests>

0 commit comments

Comments
 (0)