Skip to content

Commit a943f77

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-34987-236-smetana' into MC-34987-236
2 parents ed14c96 + a6e08c6 commit a943f77

5 files changed

+38
-30
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
<requiredEntity createDataKey="createSecondSimpleProduct"/>
4949
</updateData>
5050

51-
<!-- Run cron twice -->
52-
<magentoCLI command="cron:run" stepKey="runCron1"/>
53-
<magentoCLI command="cron:run" stepKey="runCron2"/>
51+
<comment userInput="Reindex invalidated indices" stepKey="runCron1"/>
52+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
5453

5554
<!-- Login as admin -->
5655
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -80,9 +79,11 @@
8079
<!-- Export created below products -->
8180
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
8281

83-
<!-- Run cron -->
84-
<magentoCLI command="cron:run" stepKey="runCron3"/>
85-
<magentoCLI command="cron:run" stepKey="runCron4"/>
82+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
83+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
84+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
85+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
86+
</actionGroup>
8687

8788
<!-- Download product -->
8889
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@
7373
<requiredEntity createDataKey="createConfigSecondChildProduct"/>
7474
</createData>
7575

76-
<!-- Run cron twice -->
77-
<magentoCLI command="cron:run" stepKey="runCron1"/>
78-
<magentoCLI command="cron:run" stepKey="runCron2"/>
76+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
77+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
7978

8079
<!-- Login as admin -->
8180
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -110,9 +109,11 @@
110109
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
111110
</actionGroup>
112111

113-
<!-- Run cron -->
114-
<magentoCLI command="cron:run" stepKey="runCron3"/>
115-
<magentoCLI command="cron:run" stepKey="runCron4"/>
112+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
113+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
114+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
115+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
116+
</actionGroup>
116117

117118
<!-- Download product -->
118119
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@
8989
<requiredEntity createDataKey="createConfigProduct"/>
9090
</createData>
9191

92-
<!-- Run cron twice -->
93-
<magentoCLI command="cron:run" stepKey="runCron1"/>
94-
<magentoCLI command="cron:run" stepKey="runCron2"/>
92+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
93+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
9594

9695
<!-- Login as admin -->
9796
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -125,9 +124,11 @@
125124
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
126125
</actionGroup>
127126

128-
<!-- Run cron -->
129-
<magentoCLI command="cron:run" stepKey="runCron3"/>
130-
<magentoCLI command="cron:run" stepKey="runCron4"/>
127+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
128+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
129+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
130+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
131+
</actionGroup>
131132

132133
<!-- Download product -->
133134
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
<requiredEntity createDataKey="createConfigSecondChildProduct"/>
7272
</createData>
7373

74-
<!-- Run cron twice -->
75-
<magentoCLI command="cron:run" stepKey="runCron1"/>
76-
<magentoCLI command="cron:run" stepKey="runCron2"/>
74+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
75+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
7776

7877
<!-- Login as admin -->
7978
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -108,9 +107,11 @@
108107
<!-- Export created below products -->
109108
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
110109

111-
<!-- Run cron -->
112-
<magentoCLI command="cron:run" stepKey="runCron3"/>
113-
<magentoCLI command="cron:run" stepKey="runCron4"/>
110+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
111+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
112+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
113+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
114+
</actionGroup>
114115

115116
<!-- Download product -->
116117
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
<requiredEntity createDataKey="createAttributeSet"/>
2929
</createData>
3030

31-
<!-- Run cron twice -->
32-
<magentoCLI command="cron:run" stepKey="runCron1"/>
33-
<magentoCLI command="cron:run" stepKey="runCron2"/>
31+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
32+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
3433

3534
<!-- Login as admin -->
3635
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -48,6 +47,9 @@
4847
</actionGroup>
4948
<!-- Log out -->
5049
<actionGroup ref="logout" stepKey="logout"/>
50+
51+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
52+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
5153
</after>
5254

5355
<!-- Go to export page -->
@@ -57,9 +59,11 @@
5759
<!-- Export created below products -->
5860
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
5961

60-
<!-- Run cron -->
61-
<magentoCLI command="cron:run" stepKey="runCron3"/>
62-
<magentoCLI command="cron:run" stepKey="runCron4"/>
62+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
63+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
64+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
65+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
66+
</actionGroup>
6367

6468
<!-- Download product -->
6569
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

0 commit comments

Comments
 (0)