Skip to content

Commit 5cade68

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/1.1-develop' into PB-107
2 parents ae462f7 + 222823d commit 5cade68

File tree

19 files changed

+667
-432
lines changed

19 files changed

+667
-432
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# CODEOWNERS file for /docs/ folder.
22
# Forces a review from other writers for anything within /docs/.
3-
/docs/ @magento/devdocs-admins
3+
/docs/ @bdenham

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@
124124
<actualResult type="variable">grabProducts</actualResult>
125125
</assertCount>
126126
</actionGroup>
127+
<actionGroup name="validateEmptyProductsContainer">
128+
<arguments>
129+
<argument name="page" defaultValue="ProductsOnStage"/>
130+
<argument name="productGroupIndex" defaultValue="1" type="string"/>
131+
</arguments>
132+
<waitForElement selector="{{page.emptyProductsPlaceholder(productGroupIndex)}}" stepKey="waitForEmptyProducts"/>
133+
<see userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{page.emptyProductsPlaceholder(productGroupIndex)}}" stepKey="seeEmptyProductsMessage"/>
134+
</actionGroup>
127135
<actionGroup name="selectCategoryFromCategoryDropDown">
128136
<arguments>
129137
<argument name="property" defaultValue="PageBuilderProductsSelectCategoryDropDown"/>

‎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/AdminPageBuilderProductsCarouselTests.xml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -700,9 +700,6 @@
700700
<group value="pagebuilder"/>
701701
<group value="pagebuilder-products"/>
702702
<group value="pagebuilder-productsCarousel"/>
703-
<skip>
704-
<issueId value="PB-207"/>
705-
</skip>
706703
</annotations>
707704
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel" after="dragProductsIntoStage">
708705
<argument name="contentType" value="PageBuilderProductsContentType"/>
@@ -3448,4 +3445,34 @@
34483445
<argument name="product" value="$$createProduct1$$"/>
34493446
</actionGroup>
34503447
</test>
3448+
<test name="AdminPageBuilderProductsCarouselValidateCanSaveProductsWithEmptyConditions" extends="AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditions">
3449+
<annotations>
3450+
<features value="PageBuilder"/>
3451+
<stories value="Products"/>
3452+
<title value="Carousel - Validate Can Save Products with Empty Condition"/>
3453+
<description value="Validate that a user can save a Products content type without any conditions set"/>
3454+
<severity value="CRITICAL"/>
3455+
<useCaseId value="PB-207"/>
3456+
<testCaseId value="MC-22881"/>
3457+
<group value="pagebuilder"/>
3458+
<group value="pagebuilder-products"/>
3459+
<group value="pagebuilder-productsCarousel"/>
3460+
</annotations>
3461+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
3462+
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
3463+
</actionGroup>
3464+
<actionGroup ref="validateEmptyProductsContainer" stepKey="validateEmptyProductsContainerOnStage">
3465+
<argument name="page" value="ProductsCarouselOnStage"/>
3466+
</actionGroup>
3467+
<actionGroup ref="validateEmptyProductsContainer" stepKey="validateEmptyProductsContainerOnStage2">
3468+
<argument name="page" value="ProductsCarouselOnStage"/>
3469+
</actionGroup>
3470+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount3">
3471+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyMax"/>
3472+
</actionGroup>
3473+
<actionGroup ref="validateProductInProducts" stepKey="validateProductOnStage3">
3474+
<argument name="page" value="ProductsCarouselOnStage"/>
3475+
<argument name="product" value="_defaultProduct"/>
3476+
</actionGroup>
3477+
</test>
34513478
</tests>

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

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,4 +1543,80 @@
15431543
<argument name="product" value="$$createProduct.name$$"/>
15441544
</actionGroup>
15451545
</test>
1546+
<test name="AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditions">
1547+
<annotations>
1548+
<features value="PageBuilder"/>
1549+
<stories value="Products"/>
1550+
<title value="Grid - Validate Can Save Products with Empty Condition"/>
1551+
<description value="Validate that a user can save a Products content type without any conditions set"/>
1552+
<severity value="CRITICAL"/>
1553+
<useCaseId value="PB-207"/>
1554+
<testCaseId value="MC-22880"/>
1555+
<group value="pagebuilder"/>
1556+
<group value="pagebuilder-products"/>
1557+
<group value="pagebuilder-productsGrid"/>
1558+
</annotations>
1559+
<before>
1560+
<createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
1561+
<createData entity="_defaultProduct" stepKey="createProduct">
1562+
<requiredEntity createDataKey="createCategory"/>
1563+
</createData>
1564+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
1565+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1566+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
1567+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1568+
</actionGroup>
1569+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1570+
</before>
1571+
<after>
1572+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
1573+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
1574+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
1575+
<actionGroup ref="logout" stepKey="logout"/>
1576+
</after>
1577+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
1578+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1579+
</actionGroup>
1580+
<actionGroup ref="dragContentTypeToStage" stepKey="dragProductsIntoStage">
1581+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1582+
</actionGroup>
1583+
<!-- Validate: Empty Category Condition -->
1584+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel">
1585+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1586+
</actionGroup>
1587+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
1588+
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
1589+
</actionGroup>
1590+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy">
1591+
<argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
1592+
</actionGroup>
1593+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1594+
<actionGroup ref="validateEmptyProductsContainer" stepKey="validateEmptyProductsContainerOnStage"/>
1595+
<!-- Validate: Empty SKU Condition -->
1596+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel2">
1597+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1598+
</actionGroup>
1599+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy2">
1600+
<argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
1601+
</actionGroup>
1602+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
1603+
<actionGroup ref="validateEmptyProductsContainer" stepKey="validateEmptyProductsContainerOnStage2"/>
1604+
<!-- Validate: Empty Conditions -->
1605+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel3">
1606+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1607+
</actionGroup>
1608+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy3">
1609+
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
1610+
</actionGroup>
1611+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy3">
1612+
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
1613+
</actionGroup>
1614+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount3">
1615+
<argument name="property" value="PageBuilderProductsCountPropertyMax"/>
1616+
</actionGroup>
1617+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
1618+
<actionGroup ref="validateProductInProducts" stepKey="validateProductOnStage3">
1619+
<argument name="product" value="_defaultProduct"/>
1620+
</actionGroup>
1621+
</test>
15461622
</tests>

‎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/adminhtml/requirejs-config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ var config = {
3636
},
3737
'Magento_Ui/js/form/form': {
3838
'Magento_PageBuilder/js/form/form-mixin': true
39+
},
40+
'Magento_PageBuilder/js/content-type/row/appearance/default/widget': {
41+
'Magento_PageBuilder/js/content-type/row/appearance/default/widget-mixin': true
3942
}
4043
}
4144
}

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)