Skip to content

Commit c7dda8f

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8714: Removed CliCacheFlushActionGroup usage for CatalogRule #31859
- Merge Pull Request #31859 from sergiy-v/magento2:mftf-CliCacheFlushActionGroup-usage-catalog-rule - Merged commits: 1. afb17e6
2 parents f6e06ec + afb17e6 commit c7dda8f

15 files changed

+21
-63
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
24-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBeforeTestRun">
25-
<argument name="tags" value="config"/>
26-
</actionGroup>
24+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheBeforeTestRun"/>
2725
</before>
2826
<after>
2927
<magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
30-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTestComplete">
31-
<argument name="tags" value="config"/>
32-
</actionGroup>
28+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheAfterTestComplete"/>
3329
</after>
3430
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3531
<actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

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

135135
<!--Clear Cache - reindex - resets products according to enabled/disabled view-->
136136
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
137-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
138-
<argument name="tags" value=""/>
139-
</actionGroup>
137+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
140138

141139
<!--Confirm bundle products have been enabled-->
142140
<amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPageEnabled"/>

‎app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@
3838
<argument name="importFile" value="catalog_product_import_bundle.csv"/>
3939
<argument name="importNoticeMessage" value="Created: 2, Updated: 0, Deleted: 0"/>
4040
</actionGroup>
41-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterCreate">
42-
<argument name="tags" value="full_page"/>
43-
</actionGroup>
41+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheAfterCreate"/>
4442
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterCreate">
4543
<argument name="indices" value="catalog_product_price"/>
4644
</actionGroup>
@@ -60,9 +58,7 @@
6058
<argument name="importFile" value="catalog_product_import_bundle.csv"/>
6159
<argument name="importNoticeMessage" value="Created: 0, Updated: 2, Deleted: 0"/>
6260
</actionGroup>
63-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterUpdate">
64-
<argument name="tags" value="full_page"/>
65-
</actionGroup>
61+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCacheAfterUpdate"/>
6662
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="indexerReindexAfterUpdate"/>
6763

6864
<!-- Check Bundle product is still visible on the storefront-->

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@
7878
<!-- 3. Save and apply the new catalog price rule -->
7979
<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
8080
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
81-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
82-
<argument name="tags" value=""/>
83-
</actionGroup>
81+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
8482

8583
<!-- 4. Verify the storefront -->
8684
<amOnPage url="$$createCategoryOne.name$$.html" stepKey="goToCategoryOne"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@
127127
<actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
128128

129129
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
130-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
131-
<argument name="tags" value=""/>
132-
</actionGroup>
130+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
133131

134132
<!-- Open Storefront product page and assert created configurable product -->
135133
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
</createData>
2626

2727
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
28-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
29-
<argument name="tags" value=""/>
30-
</actionGroup>
28+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
3129

3230
<!-- log in and create the price rule -->
3331
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
5050

5151
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
52-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
53-
<argument name="tags" value=""/>
54-
</actionGroup>
52+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
5553

5654
<!-- As a NOT LOGGED IN user, go to the storefront category page and should see the discount -->
5755
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToCategory1">

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272
</createData>
7373

7474
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
75-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
76-
<argument name="tags" value=""/>
77-
</actionGroup>
75+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
7876

7977
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
8078

@@ -115,9 +113,7 @@
115113
<see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
116114

117115
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
118-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
119-
<argument name="tags" value=""/>
120-
</actionGroup>
116+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
121117

122118
<!-- Assert that the rule isn't present on the Category page -->
123119
<amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
<see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
6161

6262
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
63-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
64-
<argument name="tags" value=""/>
65-
</actionGroup>
63+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
6664

6765
<!-- Assert that the rule isn't present on the Category page -->
6866
<amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@
8686
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
8787
<argument name="indices" value="catalog_product_price"/>
8888
</actionGroup>
89-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
90-
<argument name="tags" value=""/>
91-
</actionGroup>
89+
<comment userInput="Adding the comment to replace CliCacheFlushActionGroup action group ('cache:flush' command) for preserving Backward Compatibility" stepKey="flushCache"/>
9290

9391
<!-- Verify that category page shows the original prices -->
9492
<amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage2"/>

0 commit comments

Comments
 (0)