Skip to content

Commit 4518a9b

Browse files
veloravenveloraven
committed
ACP2E-1435: Abandoned Cart's Filter Function Doesn't Work With Email Addresses Contain A + Sign
1 parent 2a9fc1a commit 4518a9b

File tree

5 files changed

+63
-7
lines changed

5 files changed

+63
-7
lines changed

‎app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInAbandonedCartsReportActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAssertNumberOfRecordsInAbandonedCartsReportActionGroup">
12+
<annotations>
13+
<description>Validates that the Number of Records listed on the Abandoned Carts Report grid page is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="number" type="string" defaultValue="1"/>
17+
</arguments>
18+
<grabTextFrom selector="{{AbandonedCartsReportMainSection.recordsFound}}" stepKey="grabAbandonedCartsAmount"/>
19+
<assertEquals message="Wrong records were found, should be only 1" stepKey="checkNumberOfRecords">
20+
<expectedResult type="string">{{number}}</expectedResult>
21+
<actualResult type="variable">grabAbandonedCartsAmount</actualResult>
22+
</assertEquals>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Reports/Test/Mftf/Page/AbandonedCartsPage.xml renamed to ‎app/code/Magento/Reports/Test/Mftf/Page/AdminAbandonedCartsReportPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9-
<page name="AbandonedCartsPage" url="reports/report_product/sold/" area="admin" module="Reports">
9+
<page name="AdminAbandonedCartsReportPage" url="reports/report_shopcart/abandoned/" area="admin" module="Reports">
1010
<section name="AbandonedCartsReportMainSection"/>
1111
<section name="AbandonedCartsGridSection"/>
1212
</page>

‎app/code/Magento/Reports/Test/Mftf/Section/AbandonedCartsGridSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AbandonedCartsGridSection">
12-
<element name="email" type="input" selector="//tr[@class='data-grid-filters']/td[@data-column='email']"/>
12+
<element name="email" type="input" selector="//tr/td[contains(@class, 'col-email')][contains(text(), '{{email1}}')]" parameterized="true"/>
1313
</section>
1414
</sections>

‎app/code/Magento/Reports/Test/Mftf/Section/AbandonedCartsReportMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<element name="email" type="input" selector="#gridAbandoned_filter_email"/>
1414
<element name="searchButton" type="button" selector="//button/span[text()='Search']"/>
1515
<element name="resetButton" type="button" selector="//button/span[text()='Reset Filter']"/>
16+
<element name="recordsFound" type="text" selector="#gridAbandoned-total-count"/>
1617
</section>
1718
</sections>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsSearchEmailWithPlusTest.xml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,37 @@
1515
<title value="Admin Reports Abandoned Carts Search Email With Plus"/>
1616
<description value="Admin should be able to search for email that contains plus > Abandoned Carts"/>
1717
<severity value="AVERAGE"/>
18-
<testCaseId value="ACP2E-1435"/>
18+
<testCaseId value="AC-7465"/>
19+
<useCaseId value="ACP2E-1435"/>
1920
<group value="reports"/>
2021
</annotations>
2122
<before>
2223
<!-- Create Category and Product -->
2324
<createData entity="_defaultCategory" stepKey="createCategory"/>
2425
<createData entity="_defaultProduct" stepKey="createProduct" />
2526

26-
<!-- Create Customer -->
27+
<!-- Create Customers -->
2728
<createData entity="Simple_US_Customer" stepKey="createCustomer">
28-
<field key="email">John+@example.com</field>
29+
<field key="email">John+Doe@example.com</field>
30+
</createData>
31+
<createData entity="Simple_US_Customer" stepKey="createCustomer2">
32+
<field key="email">JohnDoe@example.com</field>
2933
</createData>
3034

3135
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3236
</before>
37+
3338
<after>
34-
<!-- Delete created Product, Category and Customer -->
39+
<!-- Delete created Product, Category and Customers -->
3540
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3641
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3742
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
43+
<deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
44+
45+
<!-- Reset filter on Abandoned Carts Report page -->
46+
<amOnPage url="{{AdminAbandonedCartsReportPage.url}}" stepKey="amOnAbandonedCartsReportPage"/>
47+
<click selector="{{AbandonedCartsReportMainSection.resetButton}}" stepKey="clickResetButton"/>
48+
3849
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3950
</after>
4051

@@ -43,7 +54,7 @@
4354
<argument name="Customer" value="$createCustomer$"/>
4455
</actionGroup>
4556

46-
<!-- Open product and add product to cart-->
57+
<!-- Open product and add product to cart of the first customer -->
4758
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
4859
<argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
4960
</actionGroup>
@@ -52,6 +63,23 @@
5263
<argument name="productCount" value="1"/>
5364
</actionGroup>
5465

66+
<!-- Logout from customer account -->
67+
<actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutFirstCustomer"/>
68+
69+
<!-- Login as a second Customer on Storefront -->
70+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomerToStorefront2">
71+
<argument name="Customer" value="$createCustomer2$"/>
72+
</actionGroup>
73+
74+
<!-- Open product and add product to cart of the first customer -->
75+
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory2">
76+
<argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
77+
</actionGroup>
78+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart2">
79+
<argument name="product" value="$createProduct$"/>
80+
<argument name="productCount" value="1"/>
81+
</actionGroup>
82+
5583
<!-- Open Abandoned carts report in Admin -->
5684
<amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
5785
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAbandonedCartsPage">
@@ -68,7 +96,10 @@
6896
</actionGroup>
6997

7098
<!-- Check record is present -->
99+
<seeElement selector="{{AbandonedCartsGridSection.email('John+')}}" stepKey="seeCartInGrid"/>
71100

101+
<!-- Check that only one record is present -->
102+
<actionGroup ref="AdminAssertNumberOfRecordsInAbandonedCartsReportActionGroup" stepKey="checkOnlyOneRecordIsFound"/>
72103

73104
</test>
74105
</tests>

0 commit comments

Comments
 (0)