Skip to content

Commit e11fa6f

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #28629: Refactoring admin create category test (by @kate-kyzyma) - #28498: [Integration] Refactoring some customer fixtures (by @Usik2203) - #28496: [Integration] Refactoring CheckoutAgreements fixtures (by @Usik2203) - #28417: Frontend customer account order list (by @engcom-Charlie) - #28631: Refactoring admin update category name with store view test (by @kate-kyzyma) - #28260: Third level category menu issue fix (by @kishorenagalingam) - #28469: MFTF: Refactoring admin check url rewrites multiple storeviews product import test (by @kate-kyzyma) Fixed GitHub Issues: - #28488: [Issue] Frontend customer account order list (reported by @m2-backlog[bot]) has been fixed in #28417 by @engcom-Charlie in 2.4-develop branch Related commits: 1. 6548d3c 2. 96e2cc0 3. 7a28e6a 4. ecda409 5. 8a9dec2 6. 4c3aaf6 7. b696ab2 - #28198: Frontend 3rd level of submenu not accessible (reported by @stradd) has been fixed in #28260 by @kishorenagalingam in 2.4-develop branch Related commits: 1. a06e9c0 2. d0bceba 3. 4d4e07f 4. b2af00b 5. 1abb423 6. c1b71d9 7. 84bfc0b
2 parents dc14e50 + 6d43d57 commit e11fa6f

File tree

29 files changed

+937
-389
lines changed

29 files changed

+937
-389
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameActionGroup.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="AdminChangeCategoryNameActionGroup">
12+
<annotations>
13+
<description>Switch the Storefront to the provided Store.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string" defaultValue="{{_defaultCategory.name}}"/>
17+
</arguments>
18+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="updateCategoryName"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameOnStoreViewLevelActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminChangeCategoryNameOnStoreViewLevelActionGroup">
12+
<annotations>
13+
<description>Updates the Category Name for proper Store View.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
</arguments>
18+
19+
<uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
20+
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="changeNameField"/>
21+
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsNotShownInMenuActionGroup.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="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup">
12+
<annotations>
13+
<description>Validate that the Category is not present in menu on Frontend.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
</arguments>
18+
19+
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
20+
stepKey="doNotSeeCatergoryInStoreFront"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.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="StorefrontAssertCategoryNameIsShownInMenuActionGroup">
12+
<annotations>
13+
<description>Validate that the Category is present in menu on Frontend.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
</arguments>
18+
19+
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
20+
stepKey="seeCatergoryInStoreFront"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@
2323

2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
2525
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage"/>
26-
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
27-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="enterCategoryName"/>
28-
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
29-
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="enterURLKey"/>
30-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
31-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
26+
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory">
27+
<argument name="categoryEntity" value="SimpleSubCategory"/>
28+
</actionGroup>
3229

33-
<!-- Literal URL below, need to refactor line + StorefrontCategoryPage when support for variable URL is implemented-->
34-
<amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
35-
<seeInTitle userInput="{{SimpleSubCategory.name}}" stepKey="assertTitle"/>
36-
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="assertInfo1"/>
30+
<!--Go to storefront and verify created category on frontend-->
31+
<actionGroup ref="CheckCategoryOnStorefrontActionGroup" stepKey="checkCreatedCategoryOnFrontend">
32+
<argument name="categoryEntity" value="SimpleSubCategory"/>
33+
</actionGroup>
3734
</test>
3835
</tests>

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

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@
3232
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3333
</after>
3434

35-
<!--Open store page -->
36-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
37-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
38-
3935
<!--Create Custom Store -->
40-
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
41-
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
42-
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
43-
<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
44-
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
36+
<actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
37+
<argument name="website" value="{{_defaultWebsite.name}}"/>
38+
<argument name="store" value="{{customStore.name}}"/>
39+
<argument name="rootCategory" value="$$rootCategory.name$$"/>
40+
</actionGroup>
4541

4642
<!--Create Store View-->
4743
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
@@ -50,32 +46,40 @@
5046
</actionGroup>
5147

5248
<!--Verify created SubCAtegory is present on Store Front -->
53-
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
54-
<waitForPageLoad stepKey="waitForPageToLoad"/>
55-
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
56-
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
57-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
49+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
50+
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="seeCustomStore">
51+
<argument name="storeName" value="{{customStore.name}}"/>
52+
</actionGroup>
53+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPage">
54+
<argument name="categoryName" value="$$category.name$$"/>
55+
</actionGroup>
56+
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
57+
<argument name="categoryName" value="$$category.name$$"/>
58+
</actionGroup>
5859

5960
<!--Open Category Page-->
6061
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
61-
6262
<!--Update Category-->
63-
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
64-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
65-
<waitForPageLoad stepKey="waitForPageToLoad1"/>
66-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
67-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
68-
<waitForPageLoad stepKey="waitForCateforyToSave"/>
69-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
63+
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandCategoryTree"/>
64+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
65+
<argument name="category" value="$$category$$"/>
66+
</actionGroup>
67+
<actionGroup ref="AdminChangeCategoryNameActionGroup" stepKey="updateCategoryName"/>
68+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
69+
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
7070

7171
<!--Verify the Category is not present in Store Front-->
72-
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
73-
<waitForPageLoad stepKey="waitForPageToLoaded2"/>
74-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
72+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
73+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
74+
<argument name="categoryName" value="{{_defaultCategory.name}}"/>
75+
</actionGroup>
76+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeOldCategoryNameInStoreFront">
77+
<argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
78+
</actionGroup>
7579

7680
<!--Verify the Updated Category is present in Store Front-->
77-
<amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
78-
<waitForPageLoad stepKey="waitForPageToLoaded3"/>
79-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
81+
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeUpdatedCatergoryNameInStoreFront">
82+
<argument name="categoryName" value="{{_defaultCategory.name}}"/>
83+
</actionGroup>
8084
</test>
8185
</tests>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerOrderActionGroup.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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="CreateCustomerOrderActionGroup">
12+
<annotations>
13+
<description>Create Order via API assigned to Customer.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="Customer" />
17+
<argument name="Product" />
18+
</arguments>
19+
20+
<createData entity="CustomerCart" stepKey="CustomerCart">
21+
<requiredEntity createDataKey="Customer"/>
22+
</createData>
23+
24+
<createData entity="CustomerCartItem" stepKey="addCartItem">
25+
<requiredEntity createDataKey="CustomerCart"/>
26+
<requiredEntity createDataKey="Product"/>
27+
</createData>
28+
29+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
30+
<requiredEntity createDataKey="CustomerCart"/>
31+
</createData>
32+
33+
<updateData createDataKey="CustomerCart" entity="CustomerOrderPaymentMethod" stepKey="sendCustomerPaymentInformation">
34+
<requiredEntity createDataKey="CustomerCart"/>
35+
</updateData>
36+
37+
</actionGroup>
38+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,9 @@
1717
<element name="viewOrder" type="button" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col actions ')]/a[contains(concat(' ',normalize-space(@class),' '),' action view ')]"/>
1818
<element name="tabRefund" type="button" selector="//a[text()='Refunds']"/>
1919
<element name="grandTotalRefund" type="text" selector="td[data-th='Grand Total'] > strong > span.price"/>
20+
<element name="currentPage" type="text" selector=".order-products-toolbar .pages .current span:nth-of-type(2)"/>
21+
<element name="pageNumber" type="text" selector="//*[@class='order-products-toolbar toolbar bottom']//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
22+
<element name="perPage" type="select" selector="//*[@class='order-products-toolbar toolbar bottom']//select[@id='limiter']"/>
23+
<element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
2024
</section>
2125
</sections>

0 commit comments

Comments
 (0)