Skip to content

Commit 8fed8c9

Browse files
StasKozarStasKozar
committed
Merge remote-tracking branch 'origin/MC-30913' into 2.3-develop-pr105
2 parents 63002cc + 1b6d373 commit 8fed8c9

File tree

103 files changed

+616
-45
lines changed

Some content is hidden

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

103 files changed

+616
-45
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
-->
8080
<actionGroup name="saveCategoryForm">
8181
<annotations>
82-
<description>Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.</description>
82+
<description>DEPRECATED. Use AdminSaveCategoryFormActionGroup instead. Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.</description>
8383
</annotations>
8484

8585
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
86-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
87-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
86+
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
87+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccess"/>
8888
</actionGroup>
8989

9090
<!--Upload image for category -->

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminCategoryPageOpenProductsInCategorySectionActionGroup">
12+
<annotations>
13+
<description>Open 'Products in Category' section on category edit page in Admin.</description>
14+
</annotations>
15+
16+
<conditionalClick selector="{{AdminCategoryProductsSection.sectionHeader}}" dependentSelector="{{AdminCategoryProductsSection.sectionBody}}" visible="false" stepKey="openSectionIfHidden" />
17+
<scrollTo selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="scrollToSection" />
18+
<waitForPageLoad stepKey="waitSectionFullyLoaded"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.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="AdminSaveCategoryFormActionGroup">
12+
<annotations>
13+
<description>Save category edit form in Admin and check success message.</description>
14+
</annotations>
15+
16+
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
17+
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
18+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppears"/>
19+
<see userInput="You saved the category." selector="{{AdminMessagesSection.success}}" stepKey="assertSuccessMessage"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="SaveCategoryFormActionGroup">
1212
<annotations>
13-
<description>Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.</description>
13+
<description>DEPRECATED. Use AdminSaveCategoryFormActionGroup instead. Requires navigation to the Category creation/edit page. Checks that the url contains the AdminCategoryPage url. Saves the Category.</description>
1414
</annotations>
1515

1616
<seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
17-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
18-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
17+
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
18+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccess"/>
1919
</actionGroup>
2020
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
3737
</entity>
3838
<entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
39-
<data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
40-
<data key="sku" unique="suffix">x&#38;trade;</data>
39+
<data key="name" unique="suffix">Pursuit Lumaflex™ Tone Band</data>
40+
<data key="sku" unique="suffix">x™</data>
4141
</entity>
4242
<entity name="SimpleProduct_25" type="product" extends="SimpleProduct2">
4343
<data key="quantity">25</data>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCategoryProductsSection">
12-
<element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
13-
<element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
14-
<element name="addProductsDisabled" type="button" selector="#catalog_category_add_product_tabs[disabled]" timeout="30"/>
15-
<element name="productsInCategorySectionTitle" type="text" selector="div[data-index='assign_products'] .fieldset-wrapper-title" timeout="10"/>
16-
<element name="productsInCategorySectionBody" type="text" selector="div[data-index='assign_products'] .admin__fieldset-wrapper-content"/>
12+
<element name="sectionHeader" type="button" selector="div[data-index='assign_products'] .fieldset-wrapper-title" timeout="30"/>
13+
<element name="sectionBody" type="button" selector="div[data-index='assign_products'] .admin__fieldset-wrapper-content" timeout="30"/>
1714
</section>
1815
</sections>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<after>
3434
<deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
3535
<actionGroup ref="logout" stepKey="logout"/>
36+
37+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
38+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
3639
</after>
3740

3841
<!-- Go to default attribute set edit page -->

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
4848
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
4949
<actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
50+
51+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
52+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
5053
</after>
5154

5255
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
<deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
119119
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
120120
<actionGroup ref="logout" stepKey="logout"/>
121+
122+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
123+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
121124
</after>
122125

123126
<!-- Open Product in Store Front Page -->

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<deleteData createDataKey="createMultiSelectProductAttribute" stepKey="deleteMultiSelectProductAttribute"/>
4444
<!-- Logout from Admin page -->
4545
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
46+
47+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
48+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
4649
</after>
4750

4851
<!-- Open created product for edit -->

0 commit comments

Comments
 (0)