Skip to content

Commit 9bb8332

Browse files
fascinosumfascinosum
committed
Merge branch '2.4.0-develop' into MC-35039
2 parents e1a484c + e583544 commit 9bb8332

File tree

246 files changed

+1374
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+1374
-464
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
24-
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
24+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBeforeTestRun">
25+
<argument name="tags" value="config"/>
26+
</actionGroup>
2527
</before>
2628
<after>
2729
<magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
28-
<magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestComplete"/>
30+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTestComplete">
31+
<argument name="tags" value="config"/>
32+
</actionGroup>
2933
</after>
3034
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3135
<actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>
24-
<magentoCLI command="cache:clean config" stepKey="cleanCache"/>
24+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
25+
<argument name="tags" value="config"/>
26+
</actionGroup>
2527
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2628
</before>
2729
<after>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@
2020
</annotations>
2121
<before>
2222
<magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
23-
<magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
23+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches1">
24+
<argument name="tags" value="config full_page"/>
25+
</actionGroup>
2426
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2527
</before>
2628
<after>
2729
<magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
28-
<magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
30+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches2">
31+
<argument name="tags" value="config full_page"/>
32+
</actionGroup>
2933
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3034
</after>
3135

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2323
<magentoCLI stepKey="enablePersistentShoppingCart" command="config:set persistent/options/enabled 1"/>
24-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
24+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
25+
<argument name="tags" value="config"/>
26+
</actionGroup>
2527
</before>
2628
<after>
2729
<magentoCLI stepKey="disablePersistentShoppingCart" command="config:set persistent/options/enabled 0"/>
28-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
30+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
31+
<argument name="tags" value="config"/>
32+
</actionGroup>
2933
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3034
</after>
3135

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
</createData>
4444

4545
<!-- Reindex -->
46-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
46+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
47+
<argument name="indices" value=""/>
48+
</actionGroup>
4749

4850
<!-- Login as admin -->
4951
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,12 @@
138138
<click selector="{{AdminProductFiltersSection.enable}}" stepKey="ClickOnEnable"/>
139139

140140
<!--Clear Cache - reindex - resets products according to enabled/disabled view-->
141-
<magentoCLI command="indexer:reindex" stepKey="reindex2"/>
142-
<magentoCLI command="cache:flush" stepKey="flushCache2"/>
141+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
142+
<argument name="indices" value=""/>
143+
</actionGroup>
144+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
145+
<argument name="tags" value=""/>
146+
</actionGroup>
143147

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
<requiredEntity createDataKey="bundleOption"/>
4141
<requiredEntity createDataKey="apiSimple"/>
4242
</createData>
43-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
43+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
44+
<argument name="indices" value=""/>
45+
</actionGroup>
4446
</before>
4547
<after>
4648
<createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
<requiredEntity createDataKey="fixedBundleOption"/>
4040
<requiredEntity createDataKey="createSimpleProductTwo"/>
4141
</createData>
42-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
42+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
43+
<argument name="indices" value=""/>
44+
</actionGroup>
4345
</before>
4446
<after>
4547
<deleteData createDataKey="createDynamicBundle" stepKey="deleteDynamicBundleProduct"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@
9595
</createData>
9696

9797
<!-- Perform CLI reindex -->
98-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
98+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
99+
<argument name="indices" value=""/>
100+
</actionGroup>
99101
</before>
100102
<after>
101103
<!-- Delete all created data -->

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<requiredEntity createDataKey="simpleProduct"/>
3737
</createData>
3838
<!-- Run reindex stock status -->
39-
<magentoCLI command="indexer:reindex" arguments="cataloginventory_stock" stepKey="reindex"/>
39+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
40+
<argument name="indices" value="cataloginventory_stock"/>
41+
</actionGroup>
4042
</before>
4143
<after>
4244
<deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/>

0 commit comments

Comments
 (0)