Skip to content

Commit 46c3cf8

Browse files
davemacaulaydavemacaulay
authored
Merge pull request #285 from magento-tsg-csl3/MC-18071
MC-18071: Reviews not displaying on product page with "Product – Full…
2 parents f006d21 + d709e73 commit 46c3cf8

File tree

4 files changed

+97
-0
lines changed

4 files changed

+97
-0
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,15 @@
5353
<waitForPageLoad stepKey="waitForPageLoad"/>
5454
<see userInput="{{CMSPage.title}}" stepKey="seePageName"/>
5555
</actionGroup>
56+
<actionGroup name="StorefrontAddProductReviewProductFullWidthLayoutActionGroup">
57+
<arguments>
58+
<argument name="review" type="entity" defaultValue="simpleProductReview"/>
59+
</arguments>
60+
<fillField selector="{{StorefrontProductReviewsSection.nicknameField}}" userInput="{{review.nickname}}" stepKey="fillNicknameField"/>
61+
<fillField selector="{{StorefrontProductReviewsSection.summaryField}}" userInput="{{review.title}}" stepKey="fillSummaryField"/>
62+
<fillField selector="{{StorefrontProductReviewsSection.reviewField}}" userInput="{{review.detail}}" stepKey="fillReviewField"/>
63+
<click selector="{{StorefrontProductReviewsSection.submitReview}}" stepKey="clickSubmitReview"/>
64+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage"/>
65+
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You submitted your review for moderation." stepKey="seeSuccessMessage"/>
66+
</actionGroup>
5667
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
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="StorefrontReviewWithProductFullWidthLayoutTest">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Catalog Product Review"/>
15+
<title value="Review should display on product page with 'Product - Full Width' layout"/>
16+
<description value="Review should display on product page with 'Product - Full Width' layout"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-18071"/>
19+
<testCaseId value="MC-19606"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-layout"/>
22+
<group value="pagebuilder-fullwidth"/>
23+
<group value="pagebuilder-catalog-product"/>
24+
</annotations>
25+
<before>
26+
<createData entity="_defaultCategory" stepKey="createCategory"/>
27+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
28+
<createData entity="ApiSimpleProduct" stepKey="createProduct">
29+
<requiredEntity createDataKey="createCategory"/>
30+
</createData>
31+
</before>
32+
<after>
33+
<actionGroup ref="logout" stepKey="logout"/>
34+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
35+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
36+
</after>
37+
<!-- Find created product in product grid and open edit product -->
38+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="findCreatedProductInGrid">
39+
<argument name="product" value="$$createProduct$$"/>
40+
</actionGroup>
41+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
42+
<argument name="product" value="$$createProduct$$"/>
43+
</actionGroup>
44+
<!-- Use Full Width layout -->
45+
<comment userInput="Set Layout to Product - Full Width" stepKey="commentSetLayout"/>
46+
<actionGroup ref="setLayout" stepKey="setFullWidthLayout">
47+
<argument name="designSection" value="ProductDesignSection"/>
48+
<argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
49+
</actionGroup>
50+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
51+
<waitForPageLoad stepKey="waitForPageLoadSaveProduct"/>
52+
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
53+
<!-- Move to frontend and make a user account and login with it -->
54+
<actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
55+
<argument name="Customer" value="CustomerEntityOne"/>
56+
</actionGroup>
57+
<!-- Go to the product view page -->
58+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openCreatedProductPage">
59+
<argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
60+
</actionGroup>
61+
<!-- Click on reviews and add review with current user -->
62+
<actionGroup ref="StorefrontAddProductReviewProductFullWidthLayoutActionGroup" stepKey="addReview"/>
63+
<!-- Go to "Pending reviews" page and clear filters -->
64+
<actionGroup ref="AdminOpenPendingReviewsPageActionGroup" stepKey="openReviewsPage"/>
65+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
66+
<!-- Moderate product review: change review status from pending to approved, save -->
67+
<actionGroup ref="AdminOpenReviewByUserNicknameActionGroup" stepKey="openCustomerReview"/>
68+
<actionGroup ref="AdminChangeReviewStatusActionGroup" stepKey="changeReviewStatus"/>
69+
<actionGroup ref="AdminSaveReviewActionGroup" stepKey="saveModeratedReview"/>
70+
<!-- Assert that product page has added review -->
71+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
72+
<argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
73+
</actionGroup>
74+
<actionGroup ref="StorefrontAssertReviewAtProductPageActionGroup" stepKey="assertReview">
75+
<argument name="rowIndex" value="1"/>
76+
</actionGroup>
77+
</test>
78+
</tests>

‎app/code/Magento/PageBuilder/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
"magento/module-require-js": "*",
2323
"php": "~7.1.3||~7.2.0||~7.3.0"
2424
},
25+
"suggest": {
26+
"magento/module-review": "*"
27+
},
2528
"conflict": {
2629
"gene/bluefoot": "*"
2730
},

‎app/code/Magento/PageBuilder/view/frontend/page_layout/product-full-width.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
<arguments>
5050
<argument name="title" translate="true" xsi:type="string">Reviews</argument>
5151
</arguments>
52+
<block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data.wrapper" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active">
53+
<arguments>
54+
<argument name="hide_title" xsi:type="boolean">true</argument>
55+
</arguments>
56+
</block>
5257
</block>
5358
</container>
5459
</container>

0 commit comments

Comments
 (0)