Skip to content

Commit 7960b32

Browse files
veloravenveloraven
committed
Merge remote-tracking branch 'magento-l3/ACP2E-226' into L3_PR_21-10-19
2 parents 4419cfb + 2324fd8 commit 7960b32

File tree

5 files changed

+180
-0
lines changed

5 files changed

+180
-0
lines changed

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection/StorefrontCustomerMyRecentReviewsSection.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="StorefrontCustomerMyRecentReviewsSection">
11+
<element name="reviewRating" type="text" selector="//ol/li[position()='{{reviewNumber}}']/div/div/span[contains(@style,'width: {{reviewValue}};')]" parameterized="true"/>
12+
</section>
13+
</sections>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminApproveAllReviewsActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminApproveAllReviewsActionGroup">
11+
<selectOption selector="{{AdminReviewGridSection.massActions}}" userInput="selectAll" stepKey="selectAll"/>
12+
<selectOption selector="{{AdminReviewGridSection.massActionsSelect}}" userInput="Update Status" stepKey="clickUpdateStatusActionDropdown"/>
13+
<waitForElementVisible selector="{{AdminReviewGridSection.massActionsStatus}}" stepKey="waitForVisibleStatusDropdown"/>
14+
<selectOption selector="{{AdminReviewGridSection.massActionsStatus}}" userInput="1" stepKey="clickApprovedActionDropdown"/>
15+
<click selector="{{AdminReviewGridSection.submit}}" stepKey="clickSubmit"/>
16+
<see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been updated." stepKey="seeSuccessMessage"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Review/Test/Mftf/Section/AdminReviewGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="firstRow" type="block" selector=".data-grid tbody tr:nth-of-type(1)"/>
1515
<element name="massActions" type="button" selector="#reviewGrid_massaction-mass-select"/>
1616
<element name="massActionsSelect" type="button" selector="#reviewGrid_massaction-select"/>
17+
<element name="massActionsStatus" type="button" selector="#status"/>
1718
<element name="submit" type="button" selector=".admin__grid-massaction-form .action-default.scalable"/>
1819
<element name="acceptModal" type="button" selector=".modal-popup.confirm button.action-accept"/>
1920
</section>

‎app/code/Magento/Review/Test/Mftf/Section/StorefrontMyProductReviewsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontMyProductReviewsSection">
1212
<element name="reviewDescription" type="text" selector="//td[@data-th='Review']"/>
13+
<element name="reviewRating" type="text" selector="//tbody/tr[position()='{{reviewNumber}}']/td/div/div/span[contains(@style,'width: {{reviewValue}};')]" parameterized="true"/>
1314
</section>
1415
</sections>

‎app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifyMultipleProductRatingsInCustomerAccountTest.xml

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
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="StorefrontVerifyMultipleProductRatingsInCustomerAccountTest">
12+
<annotations>
13+
<features value="Review"/>
14+
<stories value="Review by Customer"/>
15+
<title value="Product Ratings are shown correctly in Customer's Account"/>
16+
<description value="Customer should see correct product ratings on My Product Reviews page in Customer account and on My Account page"/>
17+
<severity value="AVERAGE"/>
18+
<useCaseId value="MC-41194"/>
19+
<testCaseId value="MC-41325"/>
20+
</annotations>
21+
<before>
22+
<!-- Enable singe store view to view ratings-->
23+
<magentoCLI command="config:set general/single_store_mode/enabled 1" stepKey="enabledSingleStoreMode"/>
24+
<!--Login-->
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
26+
<!--Create category and products-->
27+
<createData entity="SimpleSubCategory" stepKey="category"/>
28+
<createData entity="SimpleProduct" stepKey="createProduct1">
29+
<requiredEntity createDataKey="category"/>
30+
</createData>
31+
<createData entity="SimpleProduct" stepKey="createProduct2" >
32+
<requiredEntity createDataKey="category"/>
33+
</createData>
34+
<createData entity="SimpleProduct" stepKey="createProduct3">
35+
<requiredEntity createDataKey="category"/>
36+
</createData>
37+
</before>
38+
39+
<after>
40+
<!-- Delete reviews -->
41+
<actionGroup ref="AdminOpenReviewsPageActionGroup" stepKey="openAllReviewsPage"/>
42+
<actionGroup ref="AdminDeleteReviewsByUserNicknameActionGroup" stepKey="deleteCustomerReview"/>
43+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearNickNameReviewFilters"/>
44+
<!-- Delete customer -->
45+
<actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
46+
<argument name="customerEmail" value="CustomerEntityOne.email"/>
47+
</actionGroup>
48+
<!--Delete category and products-->
49+
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
50+
<deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
51+
<deleteData createDataKey="createProduct3" stepKey="deleteProduct3"/>
52+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
53+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
54+
<!-- Disable single store view back-->
55+
<magentoCLI command="config:set general/single_store_mode/enabled 0" stepKey="enabledSingleStoreMode"/>
56+
</after>
57+
58+
<!-- Go to frontend and make a user account and login with it -->
59+
<actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
60+
<argument name="Customer" value="CustomerEntityOne"/>
61+
</actionGroup>
62+
<!-- Go to first product view page -->
63+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
64+
<argument name="productUrl" value="$$createProduct1.custom_attributes[url_key]$$"/>
65+
</actionGroup>
66+
<!-- Click on reviews and add reviews with current user -->
67+
<click selector="{{StorefrontProductReviewsSection.reviewsTab}}" stepKey="openReviewTab"/>
68+
<!-- Set product rating stars -->
69+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setQualityStars">
70+
<argument name="ratingName" value="Quality"/>
71+
<argument name="stars" value="1"/>
72+
</actionGroup>
73+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setValueStars">
74+
<argument name="ratingName" value="Value"/>
75+
<argument name="stars" value="1"/>
76+
</actionGroup>
77+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setPriceStars">
78+
<argument name="ratingName" value="Price"/>
79+
<argument name="stars" value="1"/>
80+
</actionGroup>
81+
<!-- Add review -->
82+
<actionGroup ref="StorefrontAddProductReviewActionGroup" stepKey="addReview"/>
83+
84+
<!-- Go to second product view page -->
85+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage2">
86+
<argument name="productUrl" value="$$createProduct2.custom_attributes[url_key]$$"/>
87+
</actionGroup>
88+
89+
<!-- Click on reviews and add reviews with current user -->
90+
<click selector="{{StorefrontProductReviewsSection.reviewsTab}}" stepKey="openReviewTab2"/>
91+
<!-- Set product rating stars -->
92+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setQualityStars2">
93+
<argument name="ratingName" value="Quality"/>
94+
<argument name="stars" value="1"/>
95+
</actionGroup>
96+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setValueStars2">
97+
<argument name="ratingName" value="Value"/>
98+
<argument name="stars" value="1"/>
99+
</actionGroup>
100+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setPriceStars2">
101+
<argument name="ratingName" value="Price"/>
102+
<argument name="stars" value="1"/>
103+
</actionGroup>
104+
<!-- Add review -->
105+
<actionGroup ref="StorefrontAddProductReviewActionGroup" stepKey="addReview2"/>
106+
107+
<!-- Go to third product view page -->
108+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage3">
109+
<argument name="productUrl" value="$$createProduct3.custom_attributes[url_key]$$"/>
110+
</actionGroup>
111+
112+
<!-- Click on reviews and add reviews with current user -->
113+
<click selector="{{StorefrontProductReviewsSection.reviewsTab}}" stepKey="openReviewTab3"/>
114+
<!-- Set product rating stars -->
115+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setQualityStars3">
116+
<argument name="ratingName" value="Quality"/>
117+
<argument name="stars" value="1"/>
118+
</actionGroup>
119+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setValueStars3">
120+
<argument name="ratingName" value="Value"/>
121+
<argument name="stars" value="1"/>
122+
</actionGroup>
123+
<actionGroup ref="StorefrontSetProductRatingStarsActionGroup" stepKey="setPriceStars3">
124+
<argument name="ratingName" value="Price"/>
125+
<argument name="stars" value="1"/>
126+
</actionGroup>
127+
<!-- Add review -->
128+
<actionGroup ref="StorefrontAddProductReviewActionGroup" stepKey="addReview3"/>
129+
130+
<!-- Approve all reviews -->
131+
<actionGroup ref="AdminOpenPendingReviewsPageActionGroup" stepKey="openPendingReviewsPage"/>
132+
<actionGroup ref="AdminApproveAllReviewsActionGroup" stepKey="approveAllCustomerReview"/>
133+
134+
<!-- Checking that all 3 reviews on the My Product Reviews page have one star ratings -->
135+
<actionGroup ref="StorefrontNavigateToMyProductReviewsPageActionGroup" stepKey="navigateToProductReviewsPage"/>
136+
<seeElement selector="{{StorefrontMyProductReviewsSection.reviewRating('1', '20%')}}" stepKey="seeFirstOneStarReviewOnMyReviews"/>
137+
<seeElement selector="{{StorefrontMyProductReviewsSection.reviewRating('2', '20%')}}" stepKey="seeSecondOneStarReviewOnMyReviews"/>
138+
<seeElement selector="{{StorefrontMyProductReviewsSection.reviewRating('3', '20%')}}" stepKey="seeThirdOneStarReviewOnMyReviews"/>
139+
140+
<!-- Checking that all 3 reviews on the My Account page have one star ratings-->
141+
<actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="openCustomerAccountPage"/>
142+
<seeElement selector="{{StorefrontCustomerMyRecentReviewsSection.reviewRating('1', '20%')}}" stepKey="seeFirstOneStarReviewOnMyAccount"/>
143+
<seeElement selector="{{StorefrontCustomerMyRecentReviewsSection.reviewRating('2', '20%')}}" stepKey="seeSecondOneStarReviewOnMyAccount"/>
144+
<seeElement selector="{{StorefrontCustomerMyRecentReviewsSection.reviewRating('3', '20%')}}" stepKey="seeThirdOneStarReviewOnMyAccount"/>
145+
146+
</test>
147+
</tests>

0 commit comments

Comments
 (0)