Skip to content

Commit a4d981f

Browse files
committed
Removed CliCacheFlushActionGroup usage for Downloadable, Elasticsearch, Elasticsearch6, Fedex, Indexer, LayeredNavigation, LoginAsCustomer, Msrp, Multishipping modules
1 parent 592c792 commit a4d981f

16 files changed

+27
-82
lines changed

app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
<!-- Create category -->
2525
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2626
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
27-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
28-
<argument name="tags" value="full_page"/>
29-
</actionGroup>
27+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3028
<!-- Login as admin -->
3129
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
3230
</before>
@@ -77,9 +75,7 @@
7775
<!-- Save product -->
7876
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
7977
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
80-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
81-
<argument name="tags" value=""/>
82-
</actionGroup>
78+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
8379

8480
<!-- Find downloadable product in grid -->
8581
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>

app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,11 @@
2828
<executeJS function="return window.location.host" stepKey="hostname"/>
2929
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
3030
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
31-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
32-
<argument name="tags" value=""/>
33-
</actionGroup>
31+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3432
</before>
3533
<after>
3634
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
37-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
38-
<argument name="tags" value=""/>
39-
</actionGroup>
35+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
4036
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4137
</after>
4238
<executeJS function="return window.location.host" stepKey="hostname"/>

app/code/Magento/Elasticsearch/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
<before>
1111
<magentoCLI stepKey="setSearchEngineToElasticsearch" command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}"/>
1212
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
13-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
14-
<argument name="tags" value=""/>
15-
</actionGroup>
13+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
1614
</before>
1715
<after></after>
1816
<include>

app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636

3737
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
3838
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
39-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushFullPageCache">
40-
<argument name="tags" value="full_page"/>
41-
</actionGroup>
39+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushFullPageCache"/>
4240
</before>
4341

4442
<after>

app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<magentoCLI command="config:set --scope={{GeneralLocalCodeConfigsForChina.scope}} --scope-code={{GeneralLocalCodeConfigsForChina.scope_code}} {{GeneralLocalCodeConfigsForChina.path}} {{GeneralLocalCodeConfigsForChina.value}}" stepKey="setLocaleToChina"/>
2727
<comment userInput="Moved to appropriate test suite" stepKey="enableElasticsearch6"/>
2828
<comment userInput="Moved to appropriate test suite" stepKey="checkConnection"/>
29-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
30-
<argument name="tags" value=""/>
31-
</actionGroup>
29+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3230
<createData entity="ApiCategory" stepKey="createCategory"/>
3331
<createData entity="ApiSimpleProduct" stepKey="createProduct">
3432
<requiredEntity createDataKey="createCategory"/>

app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<!--Set Minimal Query Length-->
2727
<magentoCLI command="config:set {{SetMinQueryLength2Config.path}} {{SetMinQueryLength2Config.value}}" stepKey="setMinQueryLength"/>
2828
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
29-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
30-
<argument name="tags" value="config"/>
31-
</actionGroup>
29+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3230
</before>
3331
<after>
3432
<!--Set configs to default-->
@@ -48,9 +46,7 @@
4846
<actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteProduct"/>
4947
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetFiltersIfExist"/>
5048
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
51-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
52-
<argument name="tags" value="config"/>
53-
</actionGroup>
49+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
5450
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5551
</after>
5652
<!--Create new searchable product attribute-->
@@ -81,9 +77,7 @@
8177
<fillField selector="{{AdminProductFormSection.attributeRequiredInput(textProductAttribute.attribute_code)}}" userInput="searchable" stepKey="fillTheAttributeRequiredInputField"/>
8278
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
8379
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
84-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
85-
<argument name="tags" value="eav"/>
86-
</actionGroup>
80+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
8781
<!--Assert search results on storefront-->
8882
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage"/>
8983
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForFirstSearchTerm">

app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
</createData>
3232
<magentoCLI command="config:set {{CustomGridPerPageValuesConfigData.path}} {{CustomGridPerPageValuesConfigData.value}}" stepKey="setCustomGridPerPageValues"/>
3333
<magentoCLI command="config:set {{CustomGridPerPageDefaultConfigData.path}} {{CustomGridPerPageDefaultConfigData.value}}" stepKey="setCustomGridPerPageDefaults"/>
34-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
35-
<argument name="tags" value="config"/>
36-
</actionGroup>
34+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
3735
<magentoCron groups="index" stepKey="runCronIndex"/>
3836
</before>
3937

app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@
5353
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
5454
<argument name="indices" value=""/>
5555
</actionGroup>
56-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
57-
<argument name="tags" value=""/>
58-
</actionGroup>
56+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
5957
</before>
6058
<after>
6159
<!--Reset configs-->
@@ -77,9 +75,7 @@
7775
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
7876
<argument name="indices" value=""/>
7977
</actionGroup>
80-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
81-
<argument name="tags" value=""/>
82-
</actionGroup>
78+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
8379
<!--Delete created data-->
8480
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
8581
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>

app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,14 @@
2424
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
2525
<magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setIndexerModeSchedule"/>
2626
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
27-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
28-
<argument name="tags" value=""/>
29-
</actionGroup>
27+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3028
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/></before>
3129
<after>
3230
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3331
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3432
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexerModeRealTime"/>
3533
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindex"/>
36-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
37-
<argument name="tags" value=""/>
38-
</actionGroup>
34+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3935
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4036
</after>
4137

app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@
5151
<selectOption selector="{{AdminProductFormSection.customSelectField($$attribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="selectAttribute"/>
5252
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
5353
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexAll"/>
54-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
55-
<argument name="tags" value=""/>
56-
</actionGroup>
54+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
5755
<!-- Check storefront mobile view for shop by button is functioning as expected -->
5856
<comment userInput="Check storefront mobile view for shop by button is functioning as expected" stepKey="commentCheckShopByButton" />
5957
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>

app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
<before>
2121
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
2222
stepKey="enableLoginAsCustomer"/>
23-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
24-
<argument name="tags" value="config"/>
25-
</actionGroup>
23+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
2624
<createData entity="_defaultCategory" stepKey="createCategory"/>
2725
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2826
<requiredEntity createDataKey="createCategory"/>
@@ -40,9 +38,7 @@
4038
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
4139
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
4240
stepKey="disableLoginAsCustomer"/>
43-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
44-
<argument name="tags" value="config"/>
45-
</actionGroup>
41+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
4642
</after>
4743

4844
<!-- Admin Login as Customer from Customer page and assert notification banner -->

app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
<before>
2121
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
2222
stepKey="enableLoginAsCustomer"/>
23-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
24-
<argument name="tags" value="config"/>
25-
</actionGroup>
23+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
2624
<createData entity="_defaultCategory" stepKey="createCategory"/>
2725
<createData entity="SimpleProduct" stepKey="createProduct">
2826
<requiredEntity createDataKey="createCategory"/>
@@ -46,9 +44,7 @@
4644
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4745
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
4846
stepKey="disableLoginAsCustomer"/>
49-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
50-
<argument name="tags" value="config"/>
51-
</actionGroup>
47+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
5248
</after>
5349

5450
<!-- Creating a new catalog price rule with 50 percent discount for Retailer customer group -->
@@ -64,9 +60,7 @@
6460
<!-- Save and apply the new catalog price rule -->
6561
<actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
6662
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
67-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
68-
<argument name="tags" value=""/>
69-
</actionGroup>
63+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
7064

7165
<!-- Admin Login as Customer -->
7266
<actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">

app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
<before>
2121
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
2222
stepKey="enableLoginAsCustomer"/>
23-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
24-
<argument name="tags" value="config"/>
25-
</actionGroup>
23+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
2624
<createData entity="_defaultCategory" stepKey="createCategory"/>
2725
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2826
<requiredEntity createDataKey="createCategory"/>
@@ -39,9 +37,7 @@
3937
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
4038
<magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
4139
stepKey="disableLoginAsCustomer"/>
42-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
43-
<argument name="tags" value="config"/>
44-
</actionGroup>
40+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushConfigCache"/>
4541
</after>
4642

4743
<!-- Add product to guest cart -->

app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,7 @@
131131
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
132132
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
133133

134-
<!--Clear cache-->
135-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
136-
<argument name="tags" value=""/>
137-
</actionGroup>
134+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
138135

139136
<!--Go to store front and check msrp for products-->
140137
<amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigProductPage"/>

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckVatIdAtAccountCreateWithMultishipmentTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
</before>
2828
<after>
2929
<magentoCLI command="config:set customer/create_account/vat_frontend_visibility 0" stepKey="showVatNumberOnStorefrontNo"/>
30-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfter">
31-
<argument name="tags" value="config"/>
32-
</actionGroup>
30+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheAfter"/>
3331
<deleteData createDataKey="category" stepKey="deleteCategory"/>
3432
<deleteData createDataKey="product" stepKey="deleteproduct"/>
3533
</after>

0 commit comments

Comments
 (0)