Skip to content

Commit 53482f2

Browse files
eugene-petroveugene-petrov
committed
Merge branch 'MAGETWO-94004' of https://git.epam.com/magn-m23/magn-m23 into MAGETWO-94004
2 parents 5294b4f + c931257 commit 53482f2

File tree

6 files changed

+80
-45
lines changed

6 files changed

+80
-45
lines changed

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.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="AdminOrderConfigureBundleProduct">
12+
<arguments>
13+
<argument name="productName" type="string"/>
14+
<argument name="productNumber" type="string"/>
15+
<argument name="productQty" type="string"/>
16+
</arguments>
17+
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
18+
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
19+
<checkOption selector="{{AdminOrderBundleProductSection.bundleProductCheckbox(productNumber)}}" stepKey="checkProduct"/>
20+
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
21+
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminOrderBundleProductSection">
12+
<element name="bundleProductCheckbox" type="checkbox" selector="(//input[contains(@class, 'admin__control-checkbox') and contains(@class, 'bundle-option')])[{{row}}]" parameterized="true"/>
13+
</section>
14+
</sections>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminOrderConfigurableProductActionGroup.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="AdminOrderConfigureConfigurableProduct">
12+
<arguments>
13+
<argument name="optionName" type="string"/>
14+
<argument name="productQty" type="string"/>
15+
</arguments>
16+
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
17+
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
18+
<selectOption selector="{{AdminOrderFormConfigureProductSection.attributeSelect}}" userInput="{{optionName}}" stepKey="selectOption"/>
19+
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
20+
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminOrderGroupedProductActionGroup.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="AdminOrderConfigureGroupedProduct">
12+
<arguments>
13+
<argument name="productSku" type="string"/>
14+
<argument name="productQty" type="string"/>
15+
</arguments>
16+
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
17+
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
18+
<fillField selector="{{AdminOrderFormGroupedProductSection.optionQty(productSku)}}" userInput="{{productQty}}" stepKey="fillOptionQuantity"/>
19+
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -131,50 +131,6 @@
131131
<scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
132132
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
133133
</actionGroup>
134-
<actionGroup name="AdminAddProductToOrderBySKU">
135-
<arguments>
136-
<argument name="productSKU" type="string"/>
137-
<argument name="productQty" type="string"/>
138-
<argument name="productNumber" type="string"/>
139-
</arguments>
140-
<click selector="{{AdminOrderFormItemsOrderedSection.addProductsBySku}}" stepKey="clickAddProduct"/>
141-
<fillField selector="{{AdminOrderFormItemsSection.skuNumber(productNumber)}}" userInput="{{productSKU}}" stepKey="fillProductSKU"/>
142-
<fillField selector="{{AdminOrderFormItemsSection.qty(productNumber)}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
143-
<click selector="{{AdminOrderFormItemsSection.addToOrder}}" stepKey="clickAddToOrder"/>
144-
</actionGroup>
145-
<actionGroup name="AdminOrderConfigureConfigurableProduct">
146-
<arguments>
147-
<argument name="optionName" type="string"/>
148-
<argument name="productQty" type="string"/>
149-
</arguments>
150-
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
151-
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
152-
<selectOption selector="{{AdminOrderFormConfigureProductSection.attributeSelect}}" userInput="{{optionName}}" stepKey="selectOption"/>
153-
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
154-
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
155-
</actionGroup>
156-
<actionGroup name="AdminOrderConfigureBundleProduct">
157-
<arguments>
158-
<argument name="productName" type="string"/>
159-
<argument name="productQty" type="string"/>
160-
<argument name="productNumber" type="string"/>
161-
</arguments>
162-
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
163-
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
164-
<checkOption selector="{{AdminOrderFormConfigureProductSection.bundleProductCheckbox(productNumber)}}" stepKey="checkProduct"/>
165-
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
166-
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
167-
</actionGroup>
168-
<actionGroup name="AdminOrderConfigureGroupedProduct">
169-
<arguments>
170-
<argument name="productSku" type="string"/>
171-
<argument name="productQty" type="string"/>
172-
</arguments>
173-
<click selector="{{AdminOrderFormItemsOrderedSection.configureButtonBySku}}" stepKey="clickConfigure"/>
174-
<waitForPageLoad stepKey="waitForConfigurePageLoad"/>
175-
<fillField selector="{{AdminOrderFormGroupedProductSection.optionQty(productSku)}}" userInput="{{productQty}}" stepKey="fillOptionQuantity"/>
176-
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
177-
</actionGroup>
178134

179135
<!--Add configurable product to order -->
180136
<actionGroup name="addConfigurableProductToOrderFromAdmin" extends="addConfigurableProductToOrder">

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@
1313
<element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
1414
<element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
1515
<element name="attributeSelect" type="select" selector="//div[contains(@class, 'product-options')]//select" timeout="30"/>
16-
<element name="bundleProductCheckbox" type="checkbox" selector="(//input[contains(@class, 'admin__control-checkbox') and contains(@class, 'bundle-option')])[{{row}}]" parameterized="true"/>
1716
</section>
1817
</sections>

0 commit comments

Comments
 (0)