Skip to content

Commit c09e4af

Browse files
tomreecetomreece
authored
Merge pull request #117 from magento-pangolin/MC-4765
MC-4765
2 parents c383b4c + e1c5071 commit c09e4af

File tree

4 files changed

+193
-0
lines changed

4 files changed

+193
-0
lines changed

‎app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesLastOrderedSection.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="AdminCustomerActivitiesLastOrderedSection">
12+
<element name="addProductToOrder" type="text" selector="//div[@id='sidebar_data_reorder']//tr[td[.='{{productName}}']]//input[contains(@name,'add')]" parameterized="true" timeout="30"/>
13+
</section>
14+
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="MoveLastOrderedConfigurableProductOnOrderPageTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Add Products to Order from Last Ordered Products Section"/>
15+
<title value="Move last ordered configurable product on order page test"/>
16+
<description value="Move last ordered configurable product on order page"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16155"/>
19+
<group value="sales"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<!-- Login as admin -->
24+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
26+
<!-- Create customer -->
27+
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
28+
29+
<!-- Create category -->
30+
<createData entity="_defaultCategory" stepKey="createCategory"/>
31+
32+
<!-- Create configurable product -->
33+
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
34+
<requiredEntity createDataKey="createCategory"/>
35+
</createData>
36+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
37+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
38+
<requiredEntity createDataKey="createConfigProductAttribute"/>
39+
</createData>
40+
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
41+
<requiredEntity createDataKey="createConfigProductAttribute"/>
42+
</createData>
43+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
44+
<requiredEntity createDataKey="createConfigProductAttribute"/>
45+
</getData>
46+
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
47+
<requiredEntity createDataKey="createConfigProductAttribute"/>
48+
<requiredEntity createDataKey="getConfigAttributeOption"/>
49+
<requiredEntity createDataKey="createCategory"/>
50+
</createData>
51+
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
52+
<requiredEntity createDataKey="createConfigProduct"/>
53+
<requiredEntity createDataKey="createConfigProductAttribute"/>
54+
<requiredEntity createDataKey="getConfigAttributeOption"/>
55+
</createData>
56+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
57+
<requiredEntity createDataKey="createConfigProduct"/>
58+
<requiredEntity createDataKey="createConfigChildProduct"/>
59+
</createData>
60+
</before>
61+
<after>
62+
<!-- Delete created data -->
63+
<actionGroup ref="logout" stepKey="logout"/>
64+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
65+
<deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
66+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
67+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
68+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
69+
</after>
70+
71+
<!-- Create order -->
72+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
73+
<argument name="customer" value="$$createCustomer$$"/>
74+
</actionGroup>
75+
76+
<!-- Add configurable product to order -->
77+
<actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
78+
<argument name="product" value="$$createConfigProduct$$"/>
79+
<argument name="attribute" value="$$createConfigProductAttribute$$"/>
80+
<argument name="option" value="$$getConfigAttributeOption$$"/>
81+
</actionGroup>
82+
83+
<!-- Select shipping method -->
84+
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
85+
<waitForPageLoad stepKey="waitForShippingMethods"/>
86+
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
87+
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
88+
89+
<!-- Submit order -->
90+
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
91+
92+
<!-- Search and open customer -->
93+
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
94+
<argument name="email" value="$$createCustomer.email$$"/>
95+
</actionGroup>
96+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
97+
<waitForPageLoad stepKey="waitForPageLoad"/>
98+
99+
<!-- Click create order -->
100+
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
101+
102+
<!-- Select product in Last Ordered Items section -->
103+
<click selector="{{AdminCustomerActivitiesLastOrderedSection.addProductToOrder($$createConfigProduct.name$$)}}" stepKey="addProductToOrder"/>
104+
105+
<!-- Click Update Changes -->
106+
<click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
107+
108+
<!-- Assert product in items ordered grid -->
109+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
110+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$123.00" stepKey="seeProductPrice"/>
111+
</test>
112+
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="MoveLastOrderedSimpleProductOnOrderPageTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Add Products to Order from Last Ordered Products Section"/>
15+
<title value="Move last ordered simple product on order page test"/>
16+
<description value="Move last ordered simple product on order page"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16154"/>
19+
<group value="sales"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<!-- Login as admin -->
24+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
26+
<!-- Create customer -->
27+
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
28+
29+
<!-- Create product -->
30+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
31+
</before>
32+
<after>
33+
<!-- Delete created data -->
34+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
35+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
36+
<actionGroup ref="logout" stepKey="logOut"/>
37+
</after>
38+
39+
<!-- Create order -->
40+
<actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
41+
<argument name="product" value="$$createProduct$$"/>
42+
<argument name="customer" value="$$createCustomer$$"/>
43+
</actionGroup>
44+
45+
<!-- Search and open customer -->
46+
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
47+
<argument name="email" value="$$createCustomer.email$$"/>
48+
</actionGroup>
49+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
50+
<waitForPageLoad stepKey="waitForPageLoad"/>
51+
52+
<!-- Click create order -->
53+
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
54+
55+
<!-- Select product in Last Ordered Items section -->
56+
<click selector="{{AdminCustomerActivitiesLastOrderedSection.addProductToOrder($$createProduct.name$$)}}" stepKey="addProductToOrder"/>
57+
58+
<!-- Click Update Changes -->
59+
<click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
60+
61+
<!-- Assert product in items ordered grid -->
62+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createProduct.name$$" stepKey="seeProductName"/>
63+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$$createProduct.price$$" stepKey="seeProductPrice"/>
64+
</test>
65+
</tests>

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Sales\Test\TestCase\MoveLastOrderedProductsOnOrderPageTest" summary="Add Products to Order from Last Ordered Products Section" ticketId="MAGETWO-27640">
1010
<variation name="MoveLastOrderedProductsOnOrderPageTestVariation1">
11+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1112
<data name="order/dataset" xsi:type="string">default</data>
1213
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
1314
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
1415
</variation>
1516
<variation name="MoveLastOrderedProductsOnOrderPageTestVariation2">
17+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1618
<data name="order/dataset" xsi:type="string">default</data>
1719
<data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
1820
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />

0 commit comments

Comments
 (0)