Skip to content

Commit

Permalink
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Browse files Browse the repository at this point in the history
Accepted Community Pull Requests:
 - magento#33700: [MFTF] Updating with AdminFillBundleItemQtyActionGroup (by @AnnaAPak)
 - magento#33701: [MFTF] Updating with AdminOpenCreateBundleProductPageActionGroup (by @AnnaAPak)
 - magento#33703: [MFTF] Updating with AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup (by @AnnaAPak)
 - magento#33526: [MFTF] AdminAddBundleItemsTest refactoring (by @AnnaAPak)
 - magento#34828: [MFTF] Replace repetitive actions to AdminClickSearchInGridActionGroup (by @Usik2203)
 - magento#34874: Replace repetitive actions with Action Groups in AdminCreateCategoryWithAnchorFieldTest (by @kate-kyzyma)
 - magento#34913: [MFTF] Replace action to AdminAssertNoErrorMessageActionGroup  (by @Usik2203)
 - magento#32758: MFTF: Unlock Admin User Entity Test (by @DmitryTsymbal)
 - magento#33372: MFTF: Shipping To Multiple Addresses If Maximum QTY Limit Was Reached (by @DmitryTsymbal)
 - magento#34610: Replace repetitive actions with Action Groups in AdminCreateCategoryWithFiveNestingTest (by @kate-kyzyma)
 - magento#33326: [MFTF] Refactoring use ActionGroup  instead <see/> tag (by @Usik2203)
 - magento#33688: [MFTF] Refactoring MoveLastOrderedSimpleProductOnOrderPageTest (by @AnnaAPak)
 - magento#33793: [MFTF] ZeroSubtotalOrdersWithProcessingStatusTest refactoring (by @AnnaAPak)
 - magento#34536: Replace repetitive actions with Action Groups in AdminUpdateStoreViewTest (by @kate-kyzyma)
 - magento#34620: Add README file for CatalogUrlRewrite, update README file for Developer and Csp module (by @ravi-chandra3197)
 - magento#33667: [MFTF] Refactoring StorefrontVerifyOrderHistoryCommentsTest (by @AnnaAPak)
 - magento#34249: [MFTF] MoveRecentlyViewedBundleFixedProductOnOrderPageTest refactoring (by @AnnaAPak)
 - magento#33325: MFTF: Disallow Guests Users To Write Product Reviews (by @DmitryTsymbal)


Fixed GitHub Issues:
 - magento#34432: [Issue] [MFTF] AdminAddBundleItemsTest refactoring (reported by @m2-assistant[bot]) has been fixed in magento#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

 - magento#34836: [Issue] MFTF: Unlock Admin User Entity Test (reported by @m2-assistant[bot]) has been fixed in magento#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

 - magento#33727: [MFTF] Adding AdminCheckOrderStatusInGridActionGroup (reported by @AnnaAPak) has been fixed in magento#33793 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. 1439ec1
     2. 778c8ae
     3. 3b33ceb

 - magento#4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in magento#34620 by @ravi-chandra3197 in 2.4-develop branch
   Related commits:
     1. f2daffd

 - magento#34280: [Issue] [MFTF] MoveRecentlyViewedBundleFixedProductOnOrderPageTest refactoring (reported by @m2-assistant[bot]) has been fixed in magento#34249 by @AnnaAPak in 2.4-develop branch
   Related commits:
     1. ef5cd8c
     2. d48d52f
     3. 757638f
  • Loading branch information
sidolov authored Feb 3, 2022
2 parents 4cc763c + 261b055 commit 926b334
Show file tree
Hide file tree
Showing 123 changed files with 1,484 additions and 336 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminClickAddOptionOnBundleProductEditPageActionGroup">
<annotations>
<description>Clicks the "Add Option" button on the Bundle Product Edit page</description>
</annotations>
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminClickAddProductToOptionByOptionIndexActionGroup">
<annotations>
<description>Clicks "Add Product To Option" button for Option by index for Bundle</description>
</annotations>
<arguments>
<argument name="optionIndex" type="string" defaultValue="1"/>
</arguments>

<waitForElementVisible selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="waitForAddProductsToOptionButton"/>
<click selector="{{AdminProductFormBundleSection.nthAddProductsToOption(optionIndex)}}" stepKey="clickAddProductsToOptionButton"/>
<waitForPageLoad stepKey="waitForPageLoadAfterAddingPorductsToBundle"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminFillBundleItemQtyActionGroup">
<annotations>
<description>Fills Bundle item qty</description>
</annotations>
<arguments>
<argument name="optionIndex" type="string" defaultValue="0"/>
<argument name="productIndex" type="string" defaultValue="0"/>
<argument name="qty" type="string" defaultValue="0"/>
</arguments>

<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(optionIndex, productIndex)}}" userInput="{{qty}}" stepKey="fillProductDefaultQty"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminFillBundleOptionTitleActionGroup">
<arguments>
<argument name="optionTitle" type="string" defaultValue="option1"/>
<argument name="index" type="string" defaultValue="0"/>
</arguments>

<waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" stepKey="waitForBundleOptions"/>
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle(index)}}" userInput="{{optionTitle}}" stepKey="fillOptionTitle"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminFillBundleOptionTypeActionGroup">
<annotations>
<description>Fills Bundle Option Type</description>
</annotations>
<arguments>
<argument name="optionType" type="string" defaultValue="Checkbox"/>
<argument name="optionIndex" type="string" defaultValue="0"/>
</arguments>

<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType(optionIndex)}}" userInput="{{optionType}}" stepKey="fillOptionType"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminOpenCreateBundleProductPageActionGroup">
<annotations>
<description>Opens the Create Product page for Bundle</description>
</annotations>

<amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<element name="priceField" type="input" selector="//div[@data-index='price']//input"/>
<element name="listedBundleItem" type="text" selector="//tr[@data-repeat-index='0']//div"/>
<element name="listedBundleItem2" type="text" selector="//tr[@data-repeat-index='2']//div"/>
<element name="bundleItem" type="text" selector="//span[@data-index='sku']"/>
<!--FirstProductOption-->
<element name="firstProductOption" type="checkbox" selector="//div[@class='admin__data-grid-outer-wrap']//tr[@data-repeat-index='0']//input[@type='checkbox']"/>
<element name="dynamicSkuToggle" type="checkbox" selector="div[data-index='sku_type'] .admin__actions-switch-label" timeout="30"/>
Expand Down
Loading

0 comments on commit 926b334

Please sign in to comment.