Skip to content

Commit 7461cf2

Browse files
tomreecetomreece
authored
Merge pull request #94 from magento-pangolin/MC-4388
2 parents eafce9d + 6c5b00d commit 7461cf2

File tree

3 files changed

+181
-0
lines changed

3 files changed

+181
-0
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="StorefrontCustomerCompareProductSection">
12+
<element name="title" type="text" selector="#block-compare-heading"/>
13+
<element name="emptyMessage" type="text" selector=".block-compare .empty"/>
14+
15+
<element name="productListMainArea" type="block" selector="#compare-items"/>
16+
<element name="productCount" type="text" selector=".block-compare .counter"/>
17+
18+
<element name="productByName" type="button" selector="//*[contains(@class, 'product-items')]//a[contains(@class, 'product-item-link')][contains(text(), '{{productName}}')]" parameterized="true"/>
19+
<element name="removeProductByName" type="button" selector="//li[contains(@class, 'product-item')]//*[contains(text(), '{{productName}}')]/../../a" parameterized="true"/>
20+
21+
<element name="compare" type="button" selector=".actions-toolbar .compare" timeout="30"/>
22+
<element name="clearAll" type="button" selector="#compare-clear-all" timeout="30"/>
23+
</section>
24+
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
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="StorefrontClearAllCompareProductsTest">
12+
<annotations>
13+
<stories value="Compare Products"/>
14+
<title value="Clear all products from the 'Compare Products' list"/>
15+
<description value="You should be able to remove all Products in the 'Compare Products' list."/>
16+
<testCaseId value="MC-14208"/>
17+
<severity value="CRITICAL"/>
18+
<group value="catalog"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<before>
23+
<!-- Create Simple Customer -->
24+
<createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer1"/>
25+
26+
<!-- Create Simple Category -->
27+
<createData entity="SimpleSubCategory" stepKey="createSimpleCategory1"/>
28+
29+
<!-- Create Simple Products -->
30+
<createData entity="SimpleProduct" stepKey="createSimpleProduct1">
31+
<requiredEntity createDataKey="createSimpleCategory1"/>
32+
</createData>
33+
<createData entity="SimpleProduct" stepKey="createSimpleProduct2">
34+
<requiredEntity createDataKey="createSimpleCategory1"/>
35+
</createData>
36+
37+
<!-- Create Configurable Product -->
38+
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct1">
39+
<requiredEntity createDataKey="createSimpleCategory1"/>
40+
</createData>
41+
42+
<!-- Create Virtual Product -->
43+
<createData entity="VirtualProduct" stepKey="createVirtualProduct1">
44+
<requiredEntity createDataKey="createSimpleCategory1"/>
45+
</createData>
46+
47+
<!-- Create Bundled Product -->
48+
<createData entity="ApiBundleProduct" stepKey="createBundleProduct1">
49+
<requiredEntity createDataKey="createSimpleCategory1"/>
50+
</createData>
51+
<createData entity="DropDownBundleOption" stepKey="createBundleOption1">
52+
<requiredEntity createDataKey="createBundleProduct1"/>
53+
</createData>
54+
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
55+
<requiredEntity createDataKey="createBundleProduct1"/>
56+
<requiredEntity createDataKey="createBundleOption1"/>
57+
<requiredEntity createDataKey="createSimpleProduct1"/>
58+
<field key="qty">10</field>
59+
</createData>
60+
61+
<!-- Create Grouped Product -->
62+
<createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct1">
63+
<requiredEntity createDataKey="createSimpleCategory1"/>
64+
</createData>
65+
<createData entity="OneSimpleProductLink" stepKey="addFirstProduct1">
66+
<requiredEntity createDataKey="createGroupedProduct1"/>
67+
<requiredEntity createDataKey="createSimpleProduct1"/>
68+
</createData>
69+
<updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct1" stepKey="addSecondProduct1">
70+
<requiredEntity createDataKey="createGroupedProduct1"/>
71+
<requiredEntity createDataKey="createSimpleProduct2"/>
72+
</updateData>
73+
74+
<!-- Create Downloadable Product -->
75+
<createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct1"/>
76+
<createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
77+
<requiredEntity createDataKey="createDownloadableProduct1"/>
78+
</createData>
79+
80+
<!-- Login -->
81+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
82+
</before>
83+
<after>
84+
<!-- Logout -->
85+
<actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
86+
87+
<!-- Delete Created Entities -->
88+
<deleteData createDataKey="createSimpleCustomer1" stepKey="deleteSimpleCustomer1"/>
89+
<deleteData createDataKey="createSimpleCategory1" stepKey="deleteSimpleCategory1"/>
90+
<deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
91+
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
92+
<deleteData createDataKey="createConfigProduct1" stepKey="deleteConfigProduct1"/>
93+
<deleteData createDataKey="createVirtualProduct1" stepKey="deleteVirtualProduct1"/>
94+
<deleteData createDataKey="createBundleProduct1" stepKey="deleteBundleProduct1"/>
95+
<deleteData createDataKey="createGroupedProduct1" stepKey="deleteGroupedProduct1"/>
96+
<deleteData createDataKey="createDownloadableProduct1" stepKey="deleteDownloadableProduct1"/>
97+
</after>
98+
99+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer1">
100+
<argument name="Customer" value="$$createSimpleCustomer1$$" />
101+
</actionGroup>
102+
103+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage1">
104+
<argument name="productUrl" value="$$createSimpleProduct1.custom_attributes[url_key]$$"/>
105+
</actionGroup>
106+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton1"/>
107+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare1">
108+
<argument name="productVar" value="$$createSimpleProduct1$$"/>
109+
</actionGroup>
110+
111+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage2">
112+
<argument name="productUrl" value="$$createConfigProduct1.custom_attributes[url_key]$$"/>
113+
</actionGroup>
114+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton2"/>
115+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare2">
116+
<argument name="productVar" value="$$createConfigProduct1$$"/>
117+
</actionGroup>
118+
119+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage3">
120+
<argument name="productUrl" value="$$createVirtualProduct1.custom_attributes[url_key]$$"/>
121+
</actionGroup>
122+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton3"/>
123+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare3">
124+
<argument name="productVar" value="$$createVirtualProduct1$$"/>
125+
</actionGroup>
126+
127+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage4">
128+
<argument name="productUrl" value="$$createBundleProduct1.custom_attributes[url_key]$$"/>
129+
</actionGroup>
130+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton4"/>
131+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare4">
132+
<argument name="productVar" value="$$createBundleProduct1$$"/>
133+
</actionGroup>
134+
135+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage5">
136+
<argument name="productUrl" value="$$createGroupedProduct1.custom_attributes[url_key]$$"/>
137+
</actionGroup>
138+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton5"/>
139+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare5">
140+
<argument name="productVar" value="$$createGroupedProduct1$$"/>
141+
</actionGroup>
142+
143+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage6">
144+
<argument name="productUrl" value="$$createDownloadableProduct1.custom_attributes[url_key]$$"/>
145+
</actionGroup>
146+
<scrollTo selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="scrollToCompareProductButton6"/>
147+
<actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare6">
148+
<argument name="productVar" value="$$createDownloadableProduct1$$"/>
149+
</actionGroup>
150+
151+
<amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="amOnMyAccountDashboard1"/>
152+
<waitForPageLoad stepKey="waitForPageLoad1"/>
153+
154+
<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearComparedProducts1"/>
155+
</test>
156+
</tests>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<testCase name="Magento\Catalog\Test\TestCase\Product\ClearAllCompareProductsTest" summary="Clear All Compare Products" ticketId="MAGETWO-25961">
1010
<variation name="ClearAllCompareProductsTestVariation1">
1111
<data name="config/dataset" xsi:type="string">compare_products</data>
12+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1213
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,downloadableProduct::default,groupedProduct::grouped_product_with_price,configurableProduct::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product</data>
1314
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareSuccessRemoveAllProductsMessage" />
1415
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLinkIsAbsent" />

0 commit comments

Comments
 (0)