Skip to content

Commit e0d719c

Browse files
Merge remote-tracking branch 'remotes/github/MAGETWO-96411' into EPAM-PR-35
2 parents 97fd70f + d6a2337 commit e0d719c

File tree

5 files changed

+53
-1
lines changed

5 files changed

+53
-1
lines changed

app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
3737
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
3838
<createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
39-
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
4039
<actionGroup ref="logout" stepKey="logout"/>
4140
<deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
4241
<deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
@@ -99,5 +98,6 @@
9998

10099
<!--Verify that Created order is in Processing status-->
101100
<see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus"/>
101+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
102102
</test>
103103
</tests>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminAddProductToShoppingCartActionGroup">
12+
<arguments>
13+
<argument name="productName" type="string"/>
14+
</arguments>
15+
<waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="waitForElementVisible"/>
16+
<click selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="expandProductItem"/>
17+
<waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="waitForProductFilterFieldVisible"/>
18+
<fillField selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="setProductName" userInput="{{productName}}"/>
19+
<click selector="{{AdminCustomerShoppingCartProductItemSection.searchButton}}" stepKey="clickSearchButton"/>
20+
<waitForAjaxLoad stepKey="waitForAjax"/>
21+
<waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="waitForElementCheckboxVisible"/>
22+
<click selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="selectFirstCheckbox"/>
23+
<click selector="{{AdminCustomerShoppingCartProductItemSection.addSelectionsToMyCartButton}}" stepKey="clickAddSelectionsToMyCartButton" after="selectFirstCheckbox"/>
24+
<waitForAjaxLoad stepKey="waitForAjax2"/>
25+
<seeElement stepKey="seeAddedProduct" selector="{{AdminCustomerShoppingCartProductItemSection.addedProductName('productName')}}"/>
26+
</actionGroup>
27+
</actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AdminCustomerMainActionsSection">
1212
<element name="saveButton" type="button" selector="#save" timeout="30"/>
1313
<element name="resetPassword" type="button" selector="#resetPassword" timeout="30"/>
14+
<element name="manageShoppingCart" type="button" selector="#manage_quote" timeout="30"/>
1415
</section>
1516
</sections>
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCustomerShoppingCartSection">
12+
<element name="createOrderButton" type="button" selector="button[title='Create Order']"/>
13+
</section>
14+
15+
<section name="AdminCustomerShoppingCartProductItemSection">
16+
<element name="productItem" type="button" selector="#dt-products"/>
17+
<element name="productNameFilter" type="input" selector="#source_products_filter_name"/>
18+
<element name="searchButton" type="button" selector="//*[@id='anchor-content']//button[@title='Search']"/>
19+
<element name="firstProductCheckbox" type="checkbox" selector="//*[@id='source_products_table']/tbody/tr[1]//*[@name='source_products']"/>
20+
<element name="addSelectionsToMyCartButton" type="button" selector="//*[@id='products_search']/div[1]//*[text()='Add selections to my cart']"/>
21+
<element name="addedProductName" type="text" selector="//*[@id='order-items_grid']//*[text()='{{var}}']" parameterized="true"/>
22+
</section>
23+
</sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminOrderFormShippingAddressSection">
1212
<element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
13+
<element name="SelectFromExistingCustomerAddress" type="select" selector="#order-shipping_address_customer_address_id"/>
1314
<element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
1415
<element name="FirstName" type="input" selector="#order-shipping_address_firstname"/>
1516
<element name="MiddleName" type="input" selector="#order-shipping_address_middlename"/>

0 commit comments

Comments
 (0)