Skip to content

Commit a41ee31

Browse files
author
Oleksandr Dubovyk
committed
Merge remote-tracking branches 'local/MC-39617' and 'local/MC-39737' into PRodubovyk20201222
3 parents cbbf4c7 + 7b2440a + acac6b2 commit a41ee31

File tree

6 files changed

+139
-3
lines changed

6 files changed

+139
-3
lines changed

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ $scriptString .= <<<script
7777
dataUrl: '{$block->escapeJs($block->escapeUrl($block->getLoadTreeUrl()))}'
7878
});
7979
80+
categoryLoader.processResponse = function (response, parent, callback) {
81+
var config = JSON.parse(response.responseText);
82+
83+
this.buildCategoryTree(parent, config);
84+
85+
if (typeof callback == "function") {
86+
callback(this, parent);
87+
}
88+
};
89+
8090
categoryLoader.buildCategoryTree = function(parent, config)
8191
{
8292
if (!config) return null;
@@ -164,8 +174,10 @@ $scriptString .= <<<script
164174
};
165175
166176
categoryLoader.on("beforeload", function(treeLoader, node) {
167-
$('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
168177
treeLoader.baseParams.id = node.attributes.id;
178+
treeLoader.baseParams.store = node.attributes.store;
179+
treeLoader.baseParams.form_key = FORM_KEY;
180+
$('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
169181
});
170182
171183
tree{$block->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$block->escapeJs($_divId)}', {

‎app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
<arguments>
9191
<argument name="header" xsi:type="string" translate="true">Last Review</argument>
9292
<argument name="type" xsi:type="string">datetime</argument>
93-
<argument name="id" xsi:type="string">created_at</argument>
94-
<argument name="index" xsi:type="string">created_at</argument>
93+
<argument name="id" xsi:type="string">last_review</argument>
94+
<argument name="index" xsi:type="string">last_review</argument>
9595
<argument name="column_css_class" xsi:type="string">col-date</argument>
9696
<argument name="header_css_class" xsi:type="string">col-date</argument>
9797
</arguments>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminFilterProductReviewByNameActionGroup">
11+
<arguments>
12+
<argument name="productName" type="string"/>
13+
</arguments>
14+
<waitForPageLoad stepKey="waitForGridToAppear"/>
15+
<fillField userInput="{{productName}}" selector="{{AdminCreateNewReviewSection.filterProductName}}" stepKey="searchReview"/>
16+
<click selector="{{AdminCreateNewReviewSection.searchButton}}" stepKey="startSearch"/>
17+
<waitForPageLoad stepKey="waitForResults"/>
18+
<see userInput="{{productName}}" selector="{{AdminCreateNewReviewSection.gridProductColumn}}" stepKey="assertReviewColumn"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,20 @@
1616
<item>Default Store View</item>
1717
</array>
1818
</entity>
19+
<entity name="firstSimpleProductReview">
20+
<data key="nickname" unique="suffix">user1</data>
21+
<data key="title">Review title 1</data>
22+
<data key="detail">Simple product review 1</data>
23+
<array key="select_stores">
24+
<item>Default Store View</item>
25+
</array>
26+
</entity>
27+
<entity name="secondSimpleProductReview">
28+
<data key="nickname" unique="suffix">user2</data>
29+
<data key="title">Review title 2</data>
30+
<data key="detail">Simple product review 2</data>
31+
<array key="select_stores">
32+
<item>Default Store View</item>
33+
</array>
34+
</entity>
1935
</entities>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@
1818
<element name="submitReview" type="button" selector="#save_button"/>
1919
<element name="SuccessMessage" type="button" selector="div.message-success"/>
2020
<element name="gridProducts_filter_review_cnt" type="button" selector="#gridProducts_filter_review_cnt"/>
21+
<element name="filterProductName" type="button" selector="#gridProducts_filter_name"/>
2122
<element name="searchButton" type="button" selector="//*[@id='gridProducts']//button[contains(@title, 'Search')]"/>
2223
<element name="gridReviewColumn" type="text" selector="//tbody//td[@data-column='review_cnt']"/>
24+
<element name="gridLastReviewColumn" type="text" selector="//tbody//td[@data-column='created_at']"/>
25+
<element name="gridProductColumn" type="text" selector="//tbody//td[@data-column='name']"/>
26+
<element name="showReviewsButton" type="text" selector="//tbody//td[@data-column='action']"/>
27+
<element name="grabLatestUserReviewDate" type="text" selector="//table[@class='data-grid']//tbody//tr[position()=1]//td[position()=3]"/>
2328
<element name="gridCustomer_filter_review_cnt" type="button" selector="#customers_grid_filter_review_cnt"/>
2429
<element name="CustomerSearchButton" type="button" selector="//*[@id='customers_grid']//button[contains(@title, 'Search')]"/>
2530
</section>

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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="AdminValidateLastReviewDateForReviewsByProductsReportTest">
12+
<annotations>
13+
<features value="Review"/>
14+
<stories value="Reports: Review by Products"/>
15+
<title value="Admin Validate Last Review Date For Review by Products Reports"/>
16+
<description value="Admin Validate Last Review Date For Review by Products Reports"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-39737"/>
19+
<testCaseId value="MC-39838"/>
20+
</annotations>
21+
<before>
22+
<!--Step1. Login as admin-->
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
24+
<!--Step2. Create product and Category-->
25+
<createData stepKey="category" entity="SimpleSubCategory"/>
26+
<createData stepKey="createProduct" entity="SimpleProduct">
27+
<requiredEntity createDataKey="category"/>
28+
</createData>
29+
</before>
30+
<after>
31+
<!--Step9. Delete newly created product reviews -->
32+
<actionGroup ref="AdminOpenReviewsPageActionGroup" stepKey="openAllReviewsPage"/>
33+
<actionGroup ref="AdminDeleteReviewsByUserNicknameActionGroup" stepKey="deleteFirstCustomerReview">
34+
<argument name="nickname" value="{{firstSimpleProductReview.nickname}}"/>
35+
</actionGroup>
36+
<actionGroup ref="AdminDeleteReviewsByUserNicknameActionGroup" stepKey="deleteSecondCustomerReview">
37+
<argument name="nickname" value="{{secondSimpleProductReview.nickname}}"/>
38+
</actionGroup>
39+
<!--Step10. delete Category and Products -->
40+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
41+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
42+
<!--Step11. Admin Logout-->
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
44+
</after>
45+
<!--Step3. Navigate to Marketing > User Content> All Review -->
46+
<amOnPage url="{{AdminReviewsPage.url}}" stepKey="openReviewsPage"/>
47+
<waitForPageLoad time="30" stepKey="waitForPageLoadCreatedReviewOne"/>
48+
49+
<!--Step4. Add First and Second Review For Same Product-->
50+
<actionGroup ref="AdminAddProductReviewActionGroup" stepKey="addFirstReview">
51+
<argument name="review" value="firstSimpleProductReview"/>
52+
<argument name="sku" value="$$createProduct.sku$$"/>
53+
</actionGroup>
54+
<amOnPage url="{{AdminReviewsPage.url}}" stepKey="openReviewsPageAgain"/>
55+
<waitForPageLoad time="30" stepKey="waitForPageLoadCreatedReviewTwo"/>
56+
<actionGroup ref="AdminAddProductReviewActionGroup" stepKey="addSecondReview">
57+
<argument name="review" value="secondSimpleProductReview"/>
58+
<argument name="sku" value="$$createProduct.sku$$"/>
59+
</actionGroup>
60+
<!--Step5. Navigate to Reports > Reviews > By Products -->
61+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByProductsPage">
62+
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
63+
<argument name="submenuUiId" value="{{AdminMenuReportsReviewsByProducts.dataUiId}}"/>
64+
</actionGroup>
65+
<!--Step6. Search product review by product name -->
66+
<actionGroup ref="AdminFilterProductReviewByNameActionGroup" stepKey="navigateToReportsReview">
67+
<argument name="productName" value="$$createProduct.name$$"/>
68+
</actionGroup>
69+
<!--Step7. Click 'Show Reviews' to see review details-->
70+
<grabTextFrom selector="{{AdminCreateNewReviewSection.gridLastReviewColumn}}" stepKey="grabLastReviewDate"/>
71+
<click selector="{{AdminCreateNewReviewSection.showReviewsButton}}" stepKey="showReviewsPage"/>
72+
<waitForPageLoad stepKey="waitForReviewListPageToLoad"/>
73+
<!--Step8. Assert product last review date matches latest user review date-->
74+
<fillField selector="{{AdminReviewGridSection.nickname}}" userInput="{{secondSimpleProductReview.nickname}}" stepKey="fillNickname"/>
75+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
76+
<waitForPageLoad stepKey="waitForGridViewPageToLoad"/>
77+
<grabTextFrom selector="{{AdminCreateNewReviewSection.grabLatestUserReviewDate}}" stepKey="grabLatestUserReviewDate"/>
78+
<assertEquals stepKey="assertReviewDate">
79+
<actualResult type="string">$grabLastReviewDate</actualResult>
80+
<expectedResult type="string">$grabLatestUserReviewDate</expectedResult>
81+
</assertEquals>
82+
</test>
83+
</tests>

0 commit comments

Comments
 (0)