Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Commit 097e3da

Browse files
tomreecetomreece
authored
Merge pull request #122 from magento-pangolin/MC-4773-1
MC-4773
2 parents 2346f71 + ab0908f commit 097e3da

File tree

5 files changed

+241
-3
lines changed

5 files changed

+241
-3
lines changed

‎app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesConfigureSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCustomerActivitiesConfigureSection">
12-
<element name="addAttribute" type="select" selector="[id*='attribute']" timeout="30"/>
12+
<element name="addAttribute" type="select" selector="//select[contains(concat(' ',normalize-space(@class),' '),' super-attribute-select ')]" timeout="30"/>
13+
<element name="dropdownProductSelection" type="select" selector="//option[contains(text(), '{{productName}}')]" parameterized="true" timeout="30"/>
1314
<element name="okButton" type="button" selector="//button[contains(concat(' ',normalize-space(@class),' '),' action-primary ')]" timeout="30"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerActivitiesRecentlyViewedSection.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="AdminCustomerActivitiesRecentlyViewedSection">
12+
<element name="addToOrderConfigure" type="button" selector="//div[@id='sidebar_data_pviewed']//tr[td[contains(.,'{{productName}}')]]//a[contains(@class, 'icon-configure')]" parameterized="true" timeout="30"/>
13+
</section>
14+
</sections>

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
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="MoveRecentlyViewedBundleFixedProductOnOrderPageTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Add Products to Order from Recently Viewed Products Section"/>
15+
<title value="Move recently viewed bundle fixed product on order page test"/>
16+
<description value="Move recently viewed bundle fixed product on order page"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16164"/>
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="SimpleSubCategory" stepKey="createCategory"/>
31+
32+
<!-- Create simple products -->
33+
<createData entity="SimpleProduct2" stepKey="createFirstProduct">
34+
<field key="price">755.00</field>
35+
</createData>
36+
<createData entity="SimpleProduct2" stepKey="createSecondProduct">
37+
<field key="price">756.00</field>
38+
</createData>
39+
40+
<!-- Create Bundle product -->
41+
<createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
42+
<requiredEntity createDataKey="createCategory"/>
43+
</createData>
44+
<createData entity="DropDownBundleOption" stepKey="createBundleOption">
45+
<requiredEntity createDataKey="createBundleProduct"/>
46+
</createData>
47+
<createData entity="ApiBundleLink" stepKey="linkFirstOptionToProduct">
48+
<requiredEntity createDataKey="createBundleProduct"/>
49+
<requiredEntity createDataKey="createBundleOption"/>
50+
<requiredEntity createDataKey="createFirstProduct"/>
51+
</createData>
52+
<createData entity="ApiBundleLink" stepKey="linkSecondOptionToProduct">
53+
<requiredEntity createDataKey="createBundleProduct"/>
54+
<requiredEntity createDataKey="createBundleOption"/>
55+
<requiredEntity createDataKey="createSecondProduct"/>
56+
</createData>
57+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
58+
</before>
59+
<after>
60+
<!-- Admin logout -->
61+
<actionGroup ref="logout" stepKey="logout"/>
62+
63+
<!-- Customer logout -->
64+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
65+
66+
<!-- Delete customer -->
67+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
68+
69+
<!-- Delete created product data -->
70+
<deleteData createDataKey="createBundleProduct" stepKey="deleteProduct"/>
71+
<deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
72+
<deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
73+
74+
<!-- Delete category -->
75+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
76+
</after>
77+
78+
<!-- Login as customer -->
79+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
80+
<argument name="Customer" value="$$createCustomer$$"/>
81+
</actionGroup>
82+
83+
<!-- Go to created product page -->
84+
<amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
85+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
86+
87+
<!-- Search and open customer -->
88+
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
89+
<argument name="email" value="$$createCustomer.email$$"/>
90+
</actionGroup>
91+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
92+
<waitForPageLoad stepKey="waitForCustomerPageLoad"/>
93+
94+
<!-- Click create order -->
95+
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
96+
97+
<!-- Add configure to bundle product -->
98+
<click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure($$createBundleProduct.name$$)}}" stepKey="configureProduct"/>
99+
<click selector="{{AdminCustomerActivitiesConfigureSection.dropdownProductSelection($$createFirstProduct.name$$)}}" stepKey="selectProductOption"/>
100+
<click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtn"/>
101+
<waitForPageLoad stepKey="waitForAddingConfigure"/>
102+
103+
<!-- Click 'Update Changes' -->
104+
<click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
105+
106+
<!-- Assert products in items ordered grid -->
107+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createBundleProduct.name$$" stepKey="seeProductName"/>
108+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$755.00" stepKey="seeProductPrice"/>
109+
</test>
110+
</tests>

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

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
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="MoveRecentlyViewedConfigurableProductOnOrderPageTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Add Products to Order from Recently Viewed Products Section"/>
15+
<title value="Move recently viewed configurable product on order page test"/>
16+
<description value="Move recently viewed configurable product on order page"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16163"/>
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+
<!-- Admin logout -->
63+
<actionGroup ref="logout" stepKey="logout"/>
64+
65+
<!-- Customer logout -->
66+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
67+
68+
<!-- Delete customer -->
69+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
70+
71+
<!-- Delete created data -->
72+
<deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
73+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
74+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
75+
76+
<!-- Delete category -->
77+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
78+
</after>
79+
80+
<!-- Login as customer -->
81+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
82+
<argument name="Customer" value="$$createCustomer$$"/>
83+
</actionGroup>
84+
85+
<!-- Go to created product page -->
86+
<amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
87+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
88+
<selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption.value$$" stepKey="selectOption"/>
89+
90+
<!-- Search and open customer -->
91+
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
92+
<argument name="email" value="$$createCustomer.email$$"/>
93+
</actionGroup>
94+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
95+
<waitForPageLoad stepKey="waitForCustomerPageLoad"/>
96+
97+
<!-- Click create order -->
98+
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
99+
100+
<!-- Add configure to product -->
101+
<click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure($$createConfigProduct.name$$)}}" stepKey="configureProduct"/>
102+
<selectOption selector="{{AdminCustomerActivitiesConfigureSection.addAttribute}}" userInput="$$getConfigAttributeOption.value$$" stepKey="selectProductOption"/>
103+
<click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtn"/>
104+
<waitForPageLoad stepKey="waitForProductConfigureLoad"/>
105+
106+
<!-- Click 'Update Changes' -->
107+
<click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickUpdateChangesBtn"/>
108+
109+
<!-- Assert products in items ordered grid -->
110+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductName"/>
111+
<see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$123.00" stepKey="seeProductPrice"/>
112+
</test>
113+
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
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\MoveRecentlyViewedProductsOnOrderPageTest" summary="Add Products to Order from Recently Viewed Products Section" ticketId="MAGETWO-29723">
1010
<variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation1">
11-
<data name="tag" xsi:type="string">to_maintain:yes</data>
11+
<data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
1212
<data name="products/0" xsi:type="string">configurableProduct::default</data>
1313
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
1414
</variation>
1515
<variation name="MoveRecentlyViewedProductsOnOrderPageTestVariation2">
16-
<data name="tag" xsi:type="string">to_maintain:yes</data>
16+
<data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
1717
<data name="products/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
1818
<constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
1919
</variation>

0 commit comments

Comments
 (0)