Skip to content

Commit c8deb5f

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-34482-kozar' into MC-34482
2 parents 07b53eb + ea85d7c commit c8deb5f

File tree

6 files changed

+62
-15
lines changed

6 files changed

+62
-15
lines changed

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

Lines changed: 5 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,10 @@
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="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
61+
<argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
62+
</actionGroup>
6263
<!-- Search for a product with a new name and Open Product -->
6364
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
6465
<argument name="product" value="UpdateAttributeNameAndDescription"/>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,13 @@
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+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
39+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
4340
</before>
4441
<after>
4542
<magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
<requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
8181
</createData>
8282

83-
<magentoCron stepKey="runCron"/>
83+
<!-- Start message queue for export consumer -->
84+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
85+
<reloadPage stepKey="refreshPage"/>
86+
<waitForPageLoad stepKey="waitForPageLoaded"/>
8487
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8588
</before>
8689
<after>
@@ -96,7 +99,7 @@
9699
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
97100

98101
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
99-
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
102+
<magentoCLI command="cron:run --group=index" stepKey="reindexInvalidatedIndices"/>
100103
</after>
101104

102105
<!-- Go to export page -->

‎app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminStartMessageQueueConsumerActionGroup">
12+
<annotations>
13+
<description>Starts message queue for specific consumer.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
17+
</arguments>
18+
19+
<magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}} --single-thread" stepKey="startMessageQueue"/>
20+
<wait time="30" stepKey="waitForQueueStarting"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminExportMessageConsumerData">
12+
<data key="consumer_name">exportProcessor</data>
13+
<data key="message_limit">100</data>
14+
</entity>
15+
<entity name="AdminProductAttributeUpdateMessageConsumerData">
16+
<data key="consumer_name">product_action_attribute.update</data>
17+
<data key="message_limit">100</data>
18+
</entity>
19+
<entity name="AdminCodeGeneratorMessageConsumerData">
20+
<data key="consumer_name">codegeneratorProcessor</data>
21+
<data key="message_limit">100</data>
22+
</entity>
23+
</entities>

‎app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@
5959
<see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon"
6060
stepKey="seeSuccessMessage"/>
6161

62-
<!-- Run cron twice -->
63-
<magentoCLI command="cron:run" stepKey="runCron1"/>
64-
<magentoCLI command="cron:run" stepKey="runCron2"/>
62+
<!-- Start message queue for export consumer -->
63+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
64+
<argument name="consumer" value="AdminCodeGeneratorMessageConsumerData"/>
65+
</actionGroup>
6566
<reloadPage stepKey="refreshPage"/>
6667
<waitForPageLoad stepKey="waitFormToReload1"/>
6768
<conditionalClick selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}"

0 commit comments

Comments
 (0)