Skip to content

Commit 926b334

Browse files
sidolovsidolov
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #33700: [MFTF] Updating with AdminFillBundleItemQtyActionGroup (by @AnnaAPak) - #33701: [MFTF] Updating with AdminOpenCreateBundleProductPageActionGroup (by @AnnaAPak) - #33703: [MFTF] Updating with AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup (by @AnnaAPak) - #33526: [MFTF] AdminAddBundleItemsTest refactoring (by @AnnaAPak) - #34828: [MFTF] Replace repetitive actions to AdminClickSearchInGridActionGroup (by @Usik2203) - #34874: Replace repetitive actions with Action Groups in AdminCreateCategoryWithAnchorFieldTest (by @kate-kyzyma) - #34913: [MFTF] Replace action to AdminAssertNoErrorMessageActionGroup (by @Usik2203) - #32758: MFTF: Unlock Admin User Entity Test (by @DmitryTsymbal) - #33372: MFTF: Shipping To Multiple Addresses If Maximum QTY Limit Was Reached (by @DmitryTsymbal) - #34610: Replace repetitive actions with Action Groups in AdminCreateCategoryWithFiveNestingTest (by @kate-kyzyma) - #33326: [MFTF] Refactoring use ActionGroup instead <see/> tag (by @Usik2203) - #33688: [MFTF] Refactoring MoveLastOrderedSimpleProductOnOrderPageTest (by @AnnaAPak) - #33793: [MFTF] ZeroSubtotalOrdersWithProcessingStatusTest refactoring (by @AnnaAPak) - #34536: Replace repetitive actions with Action Groups in AdminUpdateStoreViewTest (by @kate-kyzyma) - #34620: Add README file for CatalogUrlRewrite, update README file for Developer and Csp module (by @ravi-chandra3197) - #33667: [MFTF] Refactoring StorefrontVerifyOrderHistoryCommentsTest (by @AnnaAPak) - #34249: [MFTF] MoveRecentlyViewedBundleFixedProductOnOrderPageTest refactoring (by @AnnaAPak) - #33325: MFTF: Disallow Guests Users To Write Product Reviews (by @DmitryTsymbal) Fixed GitHub Issues: - #34432: [Issue] [MFTF] AdminAddBundleItemsTest refactoring (reported by @m2-assistant[bot]) has been fixed in #33526 by @AnnaAPak in 2.4-develop branch Related commits: 1. 9f06c5f 2. 987ace7 3. cca680d 4. 82a4440 5. 6c9f5b5 6. 1e01381 7. ca836de 8. 2688dca 9. 66b3a1d 10. 88e9708 11. 7f9452b 12. 888d96f - #34836: [Issue] MFTF: Unlock Admin User Entity Test (reported by @m2-assistant[bot]) has been fixed in #32758 by @DmitryTsymbal in 2.4-develop branch Related commits: 1. e1a8c68 2. 7cf5fee 3. 6c92add 4. ff7a43d 5. 5bcc71b 6. 2dfaa8e 7. a31a082 8. 99ab317 - #33727: [MFTF] Adding AdminCheckOrderStatusInGridActionGroup (reported by @AnnaAPak) has been fixed in #33793 by @AnnaAPak in 2.4-develop branch Related commits: 1. 1439ec1 2. 778c8ae 3. 3b33ceb - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #34620 by @ravi-chandra3197 in 2.4-develop branch Related commits: 1. f2daffd - #34280: [Issue] [MFTF] MoveRecentlyViewedBundleFixedProductOnOrderPageTest refactoring (reported by @m2-assistant[bot]) has been fixed in #34249 by @AnnaAPak in 2.4-develop branch Related commits: 1. ef5cd8c 2. d48d52f 3. 757638f
2 parents 4cc763c + 261b055 commit 926b334

File tree

123 files changed

+1484
-336
lines changed

Some content is hidden

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

123 files changed

+1484
-336
lines changed

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddOptionOnBundleProductEditPageActionGroup.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AdminClickAddOptionOnBundleProductEditPageActionGroup">
12+
<annotations>
13+
<description>Clicks the "Add Option" button on the Bundle Product Edit page</description>
14+
</annotations>
15+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionByOptionIndexActionGroup.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="AdminClickAddProductToOptionByOptionIndexActionGroup">
12+
<annotations>
13+
<description>Clicks "Add Product To Option" button for Option by index for Bundle</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="1"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="waitForAddProductsToOptionButton"/>
20+
<click selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="clickAddProductsToOptionButton"/>
21+
<waitForPageLoad stepKey="waitForPageLoadAfterAddingPorductsToBundle"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleItemQtyActionGroup.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="AdminFillBundleItemQtyActionGroup">
12+
<annotations>
13+
<description>Fills Bundle item qty</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="0"/>
17+
<argument name="productIndex" type="string" defaultValue="0"/>
18+
<argument name="qty" type="string" defaultValue="0"/>
19+
</arguments>
20+
21+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(optionIndex, productIndex)}}" userInput="{{qty}}" stepKey="fillProductDefaultQty"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleOptionTitleActionGroup.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="AdminFillBundleOptionTitleActionGroup">
12+
<arguments>
13+
<argument name="optionTitle" type="string" defaultValue="option1"/>
14+
<argument name="index" type="string" defaultValue="0"/>
15+
</arguments>
16+
17+
<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" stepKey="waitForBundleOptions"/>
18+
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" userInput="{{optionTitle}}" stepKey="fillOptionTitle"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminFillBundleOptionTypeActionGroup.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="AdminFillBundleOptionTypeActionGroup">
12+
<annotations>
13+
<description>Fills Bundle Option Type</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionType" type="string" defaultValue="Checkbox"/>
17+
<argument name="optionIndex" type="string" defaultValue="0"/>
18+
</arguments>
19+
20+
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType(optionIndex)}}" userInput="{{optionType}}" stepKey="fillOptionType"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOpenCreateBundleProductPageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenCreateBundleProductPageActionGroup">
12+
<annotations>
13+
<description>Opens the Create Product page for Bundle</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
17+
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<element name="priceField" type="input" selector="//div[@data-index='price']//input"/>
7676
<element name="listedBundleItem" type="text" selector="//tr[@data-repeat-index='0']//div"/>
7777
<element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
78+
<element name="bundleItem" type="text" selector="//span[@data-index='sku']"/>
7879
<!--FirstProductOption-->
7980
<element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
8081
<element name="dynamicSkuToggle" type="checkbox" selector="div[data-index='sku_type'] .admin__actions-switch-label" timeout="30"/>

0 commit comments

Comments
 (0)