Skip to content

Commit d4add32

Browse files
committed
Merge remote-tracking branch 'origin/MC-32332' into 2.4-develop-pr16
2 parents 17a9587 + 85d6433 commit d4add32

File tree

6 files changed

+157
-0
lines changed

6 files changed

+157
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="AdminAddProductReviewActionGroup">
11+
<arguments>
12+
<argument name="review" type="entity" defaultValue="simpleProductReview"/>
13+
<argument name="sku" type="string"/>
14+
</arguments>
15+
<!--Click on Add New Review -->
16+
<click selector="{{AdminCreateNewReviewSection.addNewReviewButton}}" stepKey="clickOnNewReview"/>
17+
<waitForElementVisible selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="waitForVisibleReviewButton"/>
18+
<!--Select Product by SKU and Create Review -->
19+
<click selector="{{AdminCreateNewReviewSection.addNewReviewBySKU(sku)}}" stepKey="addNewReviewBySKU"/>
20+
<waitForElementVisible selector="{{AdminCreateNewReviewSection.select_stores}}" stepKey="waitForVisibleReviewDetails"/>
21+
<selectOption selector="{{AdminCreateNewReviewSection.select_stores}}" userInput="{{review.select_stores[0]}}" stepKey="visibilityField"/>
22+
<fillField selector="{{AdminCreateNewReviewSection.nickname}}" userInput="{{review.nickname}}" stepKey="fillNicknameField"/>
23+
<fillField selector="{{AdminCreateNewReviewSection.title}}" userInput="{{review.title}}" stepKey="fillSummaryField"/>
24+
<fillField selector="{{AdminCreateNewReviewSection.detail}}" userInput="{{review.detail}}" stepKey="fillReviewField"/>
25+
<click selector="{{AdminCreateNewReviewSection.submitReview}}" stepKey="clickSubmitReview"/>
26+
<waitForElementVisible selector="{{AdminCreateNewReviewSection.SuccessMessage}}" stepKey="waitForSuccessMessage"/>
27+
<see selector="{{AdminCreateNewReviewSection.SuccessMessage}}" userInput="You saved the review." stepKey="seeSuccessMessage"/>
28+
</actionGroup>
29+
</actionGroups>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminFilterProductReviewActionGroup">
11+
<arguments>
12+
<argument name="reviewCount" type="string"/>
13+
</arguments>
14+
<!--Sort Review Column in Grid -->
15+
<waitForPageLoad stepKey="waitForGridToAppear"/>
16+
<fillField userInput="{{reviewCount}}" selector="{{AdminCreateNewReviewSection.gridProducts_filter_review_cnt}}" stepKey="searchReview"/>
17+
<click selector="{{AdminCreateNewReviewSection.searchButton}}" stepKey="startSearch"/>
18+
<waitForPageLoad stepKey="waitForResults"/>
19+
<see userInput="{{reviewCount}}" selector="{{AdminCreateNewReviewSection.gridReviewColumn}}" stepKey="assertReviewColumn"/>
20+
</actionGroup>
21+
</actionGroups>

app/code/Magento/Review/Test/Mftf/Data/ProductReviewData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
<data key="nickname" unique="suffix">user</data>
1313
<data key="title">Review title</data>
1414
<data key="detail">Simple product review</data>
15+
<array key="select_stores">
16+
<item>Default Store View</item>
17+
</array>
1518
</entity>
1619
</entities>
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminProductReviewPage" url="review/product/new/{{productId}}/" area="admin" module="Review" parameterized="true">
12+
<section name="AdminCreateNewReviewSection"/>
13+
</page>
14+
</pages>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="AdminCreateNewReviewSection">
12+
<element name="addNewReviewButton" type="button" selector="#add" timeout="30"/>
13+
<element name="addNewReviewBySKU" type="text" selector="//td[contains(@class,'col-sku')][contains(text(),'{{sku}}')]" parameterized="true"/>
14+
<element name="select_stores" type="text" selector="#select_stores"/>
15+
<element name="nickname" type="text" selector="#nickname"/>
16+
<element name="title" type="text" selector="#title"/>
17+
<element name="detail" type="textarea" selector="#detail"/>
18+
<element name="submitReview" type="button" selector="#save_button"/>
19+
<element name="SuccessMessage" type="button" selector="div.message-success"/>
20+
<element name="gridProducts_filter_review_cnt" type="button" selector="#gridProducts_filter_review_cnt"/>
21+
<element name="searchButton" type="button" selector="//*[@id='gridProducts']//button[contains(@title, 'Search')]"/>
22+
<element name="gridReviewColumn" type="text" selector="//tbody//td[@data-column='review_cnt']"/>
23+
<element name="gridCustomer_filter_review_cnt" type="button" selector="#customers_grid_filter_review_cnt"/>
24+
<element name="CustomerSearchButton" type="button" selector="//*[@id='customers_grid']//button[contains(@title, 'Search')]"/>
25+
</section>
26+
</sections>
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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="AdminReviewsByProductsReportTest">
12+
<annotations>
13+
<features value="Review"/>
14+
<stories value="Review By Products"/>
15+
<title value="Admin Reports Review by Products"/>
16+
<description value="Review By Products Grid Filters"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="MC-32083"/>
19+
</annotations>
20+
<before>
21+
<!--Login-->
22+
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
23+
<!--Create product and Category-->
24+
<createData stepKey="category" entity="SimpleSubCategory"/>
25+
<createData stepKey="createProduct1" entity="SimpleProduct">
26+
<requiredEntity createDataKey="category"/>
27+
</createData>
28+
<createData stepKey="createProduct2" entity="SimpleProduct">
29+
<requiredEntity createDataKey="category"/>
30+
</createData>
31+
</before>
32+
<after>
33+
<!-- Delete reviews -->
34+
<actionGroup ref="AdminOpenReviewsPageActionGroup" stepKey="openAllReviewsPage"/>
35+
<actionGroup ref="AdminDeleteReviewsByUserNicknameActionGroup" stepKey="deleteCustomerReview"/>
36+
<!--delete Category and Products -->
37+
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
38+
<deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
39+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
40+
<!--Logout-->
41+
<actionGroup ref="logout" stepKey="logout"/>
42+
</after>
43+
<!-- Navigate to Marketing > User Content> All Review -->
44+
<amOnPage url="{{AdminReviewsPage.url}}" stepKey="openReviewsPage"/>
45+
<waitForPageLoad time="30" stepKey="waitForPageLoadCreatedReviewOne"/>
46+
<actionGroup ref="AdminAddProductReviewActionGroup" stepKey="addFirstReview">
47+
<argument name="sku" value="$$createProduct1.sku$$"/>
48+
</actionGroup>
49+
<waitForPageLoad time="30" stepKey="waitForPageLoadCreatedReviewTwo"/>
50+
<actionGroup ref="AdminAddProductReviewActionGroup" stepKey="addSecondReview">
51+
<argument name="sku" value="$$createProduct2.sku$$"/>
52+
</actionGroup>
53+
<!-- Navigate to Reports > Reviews >By Products -->
54+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByProductsPage">
55+
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
56+
<argument name="submenuUiId" value="{{AdminMenuReportsReviewsByProducts.dataUiId}}"/>
57+
</actionGroup>
58+
<!--Sort Review Column -->
59+
<grabTextFrom selector="{{AdminCreateNewReviewSection.gridReviewColumn}}" stepKey="grabReviewQuantity"/>
60+
<actionGroup ref="AdminFilterProductReviewActionGroup" stepKey="navigateToReportsReview">
61+
<argument name="reviewCount" value="$grabReviewQuantity"/>
62+
</actionGroup>
63+
</test>
64+
</tests>

0 commit comments

Comments
 (0)