Skip to content

Commit 5809bee

Browse files
eduard13eduard13
authored
Merge branch '2.4-develop' into feature/review-graphql-261
2 parents 20dfcc6 + 63a6786 commit 5809bee

File tree

3,368 files changed

+1840
-224441
lines changed

Some content is hidden

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

3,368 files changed

+1840
-224441
lines changed

‎.php_cs.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
$finder = PhpCsFixer\Finder::create()
1212
->name('*.phtml')
13-
->exclude('dev/tests/functional/generated')
14-
->exclude('dev/tests/functional/var')
15-
->exclude('dev/tests/functional/vendor')
1613
->exclude('dev/tests/integration/tmp')
1714
->exclude('dev/tests/integration/var')
1815
->exclude('lib/internal/Cm')

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliCacheCleanActionGroup">
12+
<annotations>
13+
<description>Run cache:clean by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliCacheFlushActionGroup">
12+
<annotations>
13+
<description>Run cache:flush by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="login"/>
2121
</annotations>
2222

23+
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2425
<actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="assertLoggedIn"/>
2526
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<requiredEntity createDataKey="createBundleOption"/>
3535
<requiredEntity createDataKey="createSimpleProduct"/>
3636
</createData>
37-
<magentoCron stepKey="runCronIndex" groups="index"/>
37+
<magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
3838
</before>
3939
<after>
4040
<!-- Delete Simple Product -->
@@ -56,9 +56,11 @@
5656
<actionGroup ref="AdminUpdateProductNameAndDescriptionAttributes" stepKey="updateProductAttribute">
5757
<argument name="product" value="UpdateAttributeNameAndDescription"/>
5858
</actionGroup>
59-
<!--Run cron twice-->
60-
<magentoCLI command="cron:run" stepKey="cronRun"/>
61-
<magentoCLI command="cron:run" stepKey="cronRunTwice"/>
59+
<!-- Start message queue for product attribute consumer -->
60+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
61+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
62+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
63+
</actionGroup>
6264
<!-- Search for a product with a new name and Open Product -->
6365
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
6466
<argument name="product" value="UpdateAttributeNameAndDescription"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
2121
<click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
2222
<waitForPageLoad stepKey="waitForProductsPage" time="10"/>
23+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
2324
<click stepKey="TickCheckbox" selector="{{ProductsPageSection.checkboxForProduct(productName)}}"/>
25+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
2426
<click stepKey="OpenActions" selector="{{ProductsPageSection.actions}}"/>
2527
<waitForAjaxLoad stepKey="waitForDelete" time="5"/>
2628
<click stepKey="ChooseDelete" selector="{{ProductsPageSection.delete}}"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="AdminProductAttributeUpdateConsumerData">
12+
<data key="consumerName">product_action_attribute.update</data>
13+
<data key="messageLimit">100</data>
14+
</entity>
15+
<entity name="AdminProductAttributeWebsiteUpdateConsumerData">
16+
<data key="consumerName">product_action_attribute.website.update</data>
17+
<data key="messageLimit">100</data>
18+
</entity>
19+
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3939
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
4040
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
41+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
42+
<magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
4343
</before>
4444
<after>
4545
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@
5656
<waitForPageLoad stepKey="waitForUpdatedProductToSave" />
5757
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
5858

59-
<!-- Run cron twice -->
60-
<magentoCLI command="cron:run" stepKey="runCron1"/>
61-
<magentoCLI command="cron:run" stepKey="runCron2"/>
62-
<reloadPage stepKey="refreshPage"/>
63-
<waitForPageLoad stepKey="waitFormToReload1"/>
59+
<!-- Start message queue -->
60+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
61+
<argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
62+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
63+
</actionGroup>
64+
<!-- Run cron -->
65+
<magentoCLI command="cron:run --group=index" stepKey="runCron"/>
6466

6567
<!--Verify product name, sku and updated price-->
6668
<click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<createData entity="ApiSimpleProduct" stepKey="createProductTwo">
3131
<requiredEntity createDataKey="createCategory"/>
3232
</createData>
33+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3334
</before>
3435
<after>
3536
<deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
@@ -39,6 +40,7 @@
3940
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
4041
<actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductFilter"/>
4142
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
43+
<magentoCron groups="index" stepKey="reindexInvalidatedIndicesAfterDelete"/>
4244
</after>
4345

4446
<!-- Search and select products -->
@@ -59,22 +61,23 @@
5961
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
6062
<!-- Update attribute -->
6163
<checkOption selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
62-
<fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
64+
<fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$createProductOne.price$0" stepKey="fillAttributeNameField"/>
6365
<click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
6466
<waitForElementVisible selector="{{AdminMessagesSection.success}}" time="60" stepKey="waitForSuccessMessage"/>
6567
<see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
6668

67-
<!-- Run cron twice -->
68-
<magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
69-
<magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
70-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
69+
<!-- Start message queue for product attribute consumer -->
70+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
71+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
72+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
73+
</actionGroup>
7174

7275
<!-- Assert on storefront default view -->
7376
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
7477
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
75-
<argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
76-
<argument name="priceFrom" value="$$createProductOne.price$$0"/>
77-
<argument name="priceTo" value="$$createProductOne.price$$0"/>
78+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
79+
<argument name="priceFrom" value="$createProductOne.price$0"/>
80+
<argument name="priceTo" value="$createProductOne.price$0"/>
7881
</actionGroup>
7982
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
8083
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInDefaultView"/>
@@ -84,9 +87,9 @@
8487
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
8588
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
8689
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameCustom">
87-
<argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
88-
<argument name="priceFrom" value="$$createProductOne.price$$0"/>
89-
<argument name="priceTo" value="$$createProductOne.price$$0"/>
90+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
91+
<argument name="priceFrom" value="$createProductOne.price$0"/>
92+
<argument name="priceTo" value="$createProductOne.price$0"/>
9093
</actionGroup>
9194
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
9295
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInCustomView"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
117117

118118
<!-- Run cron -->
119-
<magentoCLI command="cron:run" stepKey="runCron"/>
119+
<magentoCLI command="cron:run --group=index" stepKey="runCron"/>
120120

121121
<!-- Clear invalidated cache on System>Tools>Cache Management page -->
122122
<amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="onCachePage"/>
@@ -188,7 +188,7 @@
188188
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>
189189

190190
<!-- Run cron -->
191-
<magentoCLI command="cron:run" stepKey="runCron2"/>
191+
<magentoCLI command="cron:run --group=index" stepKey="runCron2"/>
192192

193193
<!-- Open frontend -->
194194
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="onFrontendPage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@
2929
<actionGroup ref="CreateStoreViewActionGroup" stepKey="createCustomStoreViewFr">
3030
<argument name="storeView" value="customStoreFR"/>
3131
</actionGroup>
32-
<!--Run full reindex and clear caches -->
33-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
34-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
3532
<!--Enable Flat Catalog Category -->
3633
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3734
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3835
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
39-
<!-- Run cron twice -->
40-
<magentoCLI command="cron:run" stepKey="runCron1"/>
41-
<magentoCLI command="cron:run" stepKey="runCron2"/>
36+
<!-- Reindex invalidated indices and clear caches -->
37+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
38+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
39+
<argument name="tags" value=""/>
40+
</actionGroup>
4241
</before>
4342
<after>
44-
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
45-
<magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
46-
<magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
4743
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
4844
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
4945
<argument name="customStore" value="customStoreEN"/>
@@ -52,6 +48,9 @@
5248
<argument name="customStore" value="customStoreFR"/>
5349
</actionGroup>
5450
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
51+
<magentoCLI command="config:set catalog/frontend/flat_catalog_category 0 " stepKey="setFlatCatalogCategory"/>
52+
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexersMode"/>
53+
<magentoCron groups="index" stepKey="reindexInvalidatedIndicesAgain"/>
5554
</after>
5655
<!--Verify Category is not listed in navigation menu-->
5756
<amOnPage url="/{{CatNotIncludeInMenu.name_lwr}}.html" stepKey="openCategoryPage"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@
3030
<actionGroup ref="CreateStoreViewActionGroup" stepKey="createCustomStoreViewFr">
3131
<argument name="storeView" value="customStoreFR"/>
3232
</actionGroup>
33-
<!--Run full reindex and clear caches -->
34-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
35-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
3633
<!--Enable Flat Catalog Category -->
3734
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
3835
<!--Open Index Management Page and Select Index mode "Update by Schedule" -->
3936
<magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
40-
<!-- Run cron twice -->
41-
<magentoCLI command="cron:run" stepKey="runCron1"/>
42-
<magentoCLI command="cron:run" stepKey="runCron2"/>
37+
<!--Run full reindex and clear caches -->
38+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
39+
<argument name="indices" value=""/>
40+
</actionGroup>
41+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
42+
<argument name="tags" value=""/>
43+
</actionGroup>
4344
</before>
4445
<after>
4546
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
<requiredEntity createDataKey="createBundleOptionWithAttribute"/>
8080
<requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
8181
</createData>
82-
83-
<magentoCron stepKey="runCron"/>
8482
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8583
</before>
8684
<after>
@@ -94,9 +92,8 @@
9492
<deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
9593
<deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
9694
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
97-
98-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
9995
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
96+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
10097
</after>
10198

10299
<!-- Go to export page -->
@@ -105,7 +102,12 @@
105102
<!-- Export created below products -->
106103
<actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
107104

108-
<magentoCron stepKey="runCronIndex" groups="index"/>
105+
<!-- Start message queue for export consumer -->
106+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
107+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
108+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
109+
</actionGroup>
110+
<reloadPage stepKey="refreshPage"/>
109111
<waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
110112
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
111113

0 commit comments

Comments
 (0)