Skip to content

Commit b2168ec

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-34482-smetana' into MC-34482
# Conflicts: # app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml # app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
2 parents 5f26535 + 4a6b4a4 commit b2168ec

7 files changed

+40
-29
lines changed

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

Lines changed: 13 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,22 @@
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="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
71+
<argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
72+
</actionGroup>
7173

7274
<!-- Assert on storefront default view -->
7375
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
7476
<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"/>
77+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
78+
<argument name="priceFrom" value="$createProductOne.price$0"/>
79+
<argument name="priceTo" value="$createProductOne.price$0"/>
7880
</actionGroup>
7981
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
8082
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInDefaultView"/>
@@ -84,9 +86,9 @@
8486
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
8587
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
8688
<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"/>
89+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
90+
<argument name="priceFrom" value="$createProductOne.price$0"/>
91+
<argument name="priceTo" value="$createProductOne.price$0"/>
9092
</actionGroup>
9193
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
9294
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInCustomView"/>

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,15 @@
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+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
4239
</before>
4340
<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" />
4741
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
4842
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
4943
<argument name="customStore" value="customStoreEN"/>
@@ -52,6 +46,9 @@
5246
<argument name="customStore" value="customStoreFR"/>
5347
</actionGroup>
5448
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
49+
<magentoCLI command="config:set catalog/frontend/flat_catalog_category 0 " stepKey="setFlatCatalogCategory"/>
50+
<magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexersMode"/>
51+
<magentoCron groups="index" stepKey="reindexInvalidatedIndicesAgain"/>
5552
</after>
5653
<!--Verify Category is not listed in navigation menu-->
5754
<amOnPage url="/{{CatNotIncludeInMenu.name_lwr}}.html" stepKey="openCategoryPage"/>

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

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

51-
<magentoCron stepKey="runCron"/>
5251
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
5352
</before>
5453
<after>
@@ -68,7 +67,10 @@
6867
<!-- Export created below products -->
6968
<actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
7069

71-
<magentoCron stepKey="runCronIndex" groups="index"/>
70+
<!-- Start message queue for export consumer -->
71+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
72+
<reloadPage stepKey="refreshPage"/>
73+
<waitForPageLoad stepKey="waitForPageLoaded"/>
7274

7375
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
7476

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@
164164
<argument name="attributeData" value="$$createExportImportConfigurableProduct.sku$$"/>
165165
</actionGroup>
166166

167-
<!-- Run cron twice -->
168-
<magentoCLI command="cron:run" stepKey="runCronFirstTime"/>
169-
<magentoCLI command="cron:run" stepKey="runCronSecondTime"/>
167+
<!-- Start message queue for export consumer -->
168+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
169+
<reloadPage stepKey="refreshPage"/>
170+
<waitForPageLoad stepKey="waitForPageLoaded"/>
170171

171172
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
172173

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@
9898
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
9999
</actionGroup>
100100

101-
<magentoCron stepKey="runCron"/>
101+
<!-- Start message queue for export consumer -->
102+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
103+
<reloadPage stepKey="refreshPage"/>
104+
<waitForPageLoad stepKey="waitForPageLoaded"/>
102105

103106
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
104107

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

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

92-
<magentoCron stepKey="runCronIndex" groups="index"/>
92+
<magentoCron groups="index" stepKey="runCronIndex"/>
9393
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
9494
</before>
9595
<after>
@@ -113,7 +113,10 @@
113113
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
114114
</actionGroup>
115115

116-
<magentoCron stepKey="runCron"/>
116+
<!-- Start message queue for export consumer -->
117+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
118+
<reloadPage stepKey="refreshPage"/>
119+
<waitForPageLoad stepKey="waitForPageLoaded"/>
117120

118121
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
119122

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@
9797
<!-- Export created below products -->
9898
<actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
9999

100-
<magentoCron stepKey="runCron"/>
100+
<!-- Start message queue for export consumer -->
101+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
102+
<reloadPage stepKey="refreshPage"/>
103+
<waitForPageLoad stepKey="waitForPageLoaded"/>
101104

102105
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
103106

0 commit comments

Comments
 (0)