Skip to content

Commit 22de8dc

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4.0-develop into magento-engcom/async-opetation-status-issue
2 parents c22caff + 2b01349 commit 22de8dc

File tree

58 files changed

+1198
-486
lines changed

Some content is hidden

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

58 files changed

+1198
-486
lines changed

‎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/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/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/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,72 +14,55 @@
1414
<title value="Admin should be able to mass update product statuses in store view scope"/>
1515
<description value="Admin should be able to mass update product statuses in store view scope"/>
1616
<severity value="AVERAGE"/>
17-
<testCaseId value="MAGETWO-59361"/>
17+
<testCaseId value="MC-28538"/>
1818
<group value="Catalog"/>
1919
<group value="Product Attributes"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424

25-
<!--Create Website -->
2625
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
27-
<argument name="newWebsiteName" value="Second Website"/>
28-
<argument name="websiteCode" value="second_website"/>
26+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
27+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
2928
</actionGroup>
30-
31-
<!--Create Store -->
3229
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
33-
<argument name="website" value="Second Website"/>
34-
<argument name="storeGroupName" value="Second Store"/>
35-
<argument name="storeGroupCode" value="second_store"/>
30+
<argument name="website" value="{{customWebsite.name}}"/>
31+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
32+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
35+
<argument name="StoreGroup" value="customStoreGroup"/>
36+
<argument name="customStore" value="customStore"/>
3637
</actionGroup>
37-
38-
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
41-
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
42-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
43-
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
44-
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
45-
<fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
46-
<fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
47-
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
48-
<click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView"/>
49-
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal"/>
50-
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
51-
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal"/>
52-
<waitForPageLoad stepKey="waitForPageLoad2" time="180"/>
53-
<waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
54-
<see userInput="You saved the store view." stepKey="seeSavedMessage"/>
5538

5639
<!--Create a Simple Product 1 -->
5740
<actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct1">
5841
<argument name="product" value="simpleProductForMassUpdate"/>
59-
<argument name="website" value="Second Website"/>
42+
<argument name="website" value="{{customWebsite.name}}"/>
6043
</actionGroup>
6144

6245
<!--Create a Simple Product 2 -->
6346
<actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct2">
6447
<argument name="product" value="simpleProductForMassUpdate2"/>
65-
<argument name="website" value="Second Website"/>
48+
<argument name="website" value="{{customWebsite.name}}"/>
6649
</actionGroup>
6750
</before>
6851
<after>
6952
<!--Delete website -->
7053
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
71-
<argument name="websiteName" value="Second Website"/>
54+
<argument name="websiteName" value="{{customWebsite.name}}"/>
7255
</actionGroup>
73-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
56+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
7457

7558
<!--Delete Products -->
76-
<actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
77-
<argument name="productName" value="simpleProductForMassUpdate.name"/>
59+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct1">
60+
<argument name="sku" value="{{simpleProductForMassUpdate.sku}}"/>
7861
</actionGroup>
79-
<actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
80-
<argument name="productName" value="simpleProductForMassUpdate2.name"/>
62+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct2">
63+
<argument name="sku" value="{{simpleProductForMassUpdate2.sku}}"/>
8164
</actionGroup>
82-
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
65+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
8366
</after>
8467

8568
<!-- Search and select products -->
@@ -92,7 +75,7 @@
9275

9376
<!-- Filter to Second Store View -->
9477
<actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterStoreView">
95-
<argument name="customStore" value="'Second Store View'"/>
78+
<argument name="customStore" value="customStore.name"/>
9679
</actionGroup>
9780

9881
<!-- Select Product 2 -->

0 commit comments

Comments
 (0)