Skip to content

Commit 842059e

Browse files
author
Hwashiang Yu
committed
MC-4234: Missing validation message for 'Number of Products to Display' on Product Content Type
- Added presave validations to test - Added additional validation requirements
1 parent 8f62935 commit 842059e

File tree

2 files changed

+56
-19
lines changed

2 files changed

+56
-19
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11-
<entity name="PageBuilderProductsCountProperty" type="pagebuilder_content_type">
11+
<entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_content_type">
1212
<data key="name">Number of Products to Display</data>
1313
<data key="section">general</data>
1414
<data key="fieldName">products_count</data>
15-
<data key="value">4</data>
15+
<data key="value">1</data>
1616
</entity>
17-
<entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_content_type">
17+
<entity name="PageBuilderProductsCountPropertyFour" type="pagebuilder_content_type">
1818
<data key="name">Number of Products to Display</data>
1919
<data key="section">general</data>
2020
<data key="fieldName">products_count</data>
21-
<data key="value">1</data>
21+
<data key="value">4</data>
2222
</entity>
23-
<entity name="PageBuilderProductsCountPropertyTwo" type="pagebuilder_content_type">
23+
<entity name="PageBuilderProductsCountPropertyMax" type="pagebuilder_content_type">
2424
<data key="name">Number of Products to Display</data>
2525
<data key="section">general</data>
2626
<data key="fieldName">products_count</data>
27-
<data key="value">2</data>
27+
<data key="value">999</data>
2828
</entity>
2929
<entity name="PageBuilderProductsInvalidMinCountProperty" type="pagebuilder_content_type">
3030
<data key="name">Number of Products to Display</data>

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

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<testCaseId value="MC-4028"/>
141141
<group value="pagebuilder"/>
142142
<group value="pagebuilder-products"/>
143+
<group value="m"/>
143144
</annotations>
144145
<before>
145146
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -150,12 +151,21 @@
150151
<createData entity="_defaultProduct" stepKey="createPreReqProduct2">
151152
<requiredEntity createDataKey="createPreReqCategory"/>
152153
</createData>
154+
<createData entity="_defaultProduct" stepKey="createPreReqProduct3">
155+
<requiredEntity createDataKey="createPreReqCategory"/>
156+
</createData>
157+
<createData entity="_defaultProduct" stepKey="createPreReqProduct4">
158+
<requiredEntity createDataKey="createPreReqCategory"/>
159+
</createData>
153160
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
154161
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
155162
</before>
156163
<after>
164+
<closeTab stepKey="closeTab"/>
157165
<deleteData createDataKey="createPreReqProduct1" stepKey="deletePreReqProduct1"/>
158166
<deleteData createDataKey="createPreReqProduct2" stepKey="deletePreReqProduct2"/>
167+
<deleteData createDataKey="createPreReqProduct3" stepKey="deletePreReqProduct3"/>
168+
<deleteData createDataKey="createPreReqProduct4" stepKey="deletePreReqProduct4"/>
159169
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
160170
<actionGroup ref="logout" stepKey="logout"/>
161171
</after>
@@ -195,15 +205,22 @@
195205
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateInvalidTypeProductsCount">
196206
<argument name="property" value="PageBuilderProductsInvalidTypeCountProperty"/>
197207
</actionGroup>
208+
<!-- Validate 999 max is valid -->
209+
<comment userInput="Validate 999 max is valid" stepKey="commentValidateMax"/>
210+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMaxProductsCount">
211+
<argument name="property" value="PageBuilderProductsCountPropertyMax"/>
212+
</actionGroup>
213+
<actionGroup ref="saveEditPanelSettings" stepKey="saveValidationEditPanelSettings"/>
214+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
215+
<argument name="contentType" value="PageBuilderProductsContentType"/>
216+
</actionGroup>
198217
<!-- Only one of them should be showing -->
199218
<comment userInput="Set only one of them should be showing" stepKey="commentSetOnlyOneShouldBeShowing"/>
200219
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterOneProductsCount">
201220
<argument name="property" value="PageBuilderProductsCountPropertyOne"/>
202221
</actionGroup>
203222
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
204-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
205-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
206-
<!-- Validate Stage After Save -->
223+
<!-- Validate Stage -->
207224
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
208225
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage">
209226
<argument name="page" value="ProductsOnStage"/>
@@ -212,6 +229,17 @@
212229
<actionGroup ref="validateProductInProductsOnStage" stepKey="validateProductsStage">
213230
<argument name="page" value="ProductsOnStage"/>
214231
</actionGroup>
232+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
233+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
234+
<!-- Validate Stage After Save -->
235+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
236+
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageAfterSave">
237+
<argument name="page" value="ProductsOnStage"/>
238+
<argument name="count" value="1"/>
239+
</actionGroup>
240+
<actionGroup ref="validateProductInProductsOnStage" stepKey="validateProductsStageAfterSave">
241+
<argument name="page" value="ProductsOnStage"/>
242+
</actionGroup>
215243
<!-- Validate Storefront -->
216244
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
217245
<openNewTab stepKey="openNewTab"/>
@@ -231,26 +259,35 @@
231259
<reloadPage stepKey="reloadPage"/>
232260
<waitForPageLoad stepKey="waitForPageLoad"/>
233261
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
234-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
262+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
235263
<argument name="contentType" value="PageBuilderProductsContentType"/>
236264
</actionGroup>
237-
<!-- Two products should be showing -->
238-
<comment userInput="Two products should be showing" stepKey="commentTwoProductsShouldBeShowing"/>
239-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterTwoProductsCount">
240-
<argument name="property" value="PageBuilderProductsCountPropertyTwo"/>
265+
<!-- Four products should be showing -->
266+
<comment userInput="Four products should be showing" stepKey="commentFourProductsShouldBeShowing"/>
267+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterFourProductsCount">
268+
<argument name="property" value="PageBuilderProductsCountPropertyFour"/>
241269
</actionGroup>
242270
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
243-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
244-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
245-
<!-- Validate Stage After Save -->
271+
<!-- Validate Stage -->
246272
<comment userInput="Validate Stage" stepKey="commentValidateStage2"/>
247273
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage2">
248274
<argument name="page" value="ProductsOnStage"/>
249-
<argument name="count" value="2"/>
275+
<argument name="count" value="4"/>
250276
</actionGroup>
251277
<actionGroup ref="validateProductInProductsOnStage" stepKey="validateProductsStage2">
252278
<argument name="page" value="ProductsOnStage"/>
253279
</actionGroup>
280+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
281+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
282+
<!-- Validate Stage After Save -->
283+
<comment userInput="Validate Stage" stepKey="commentValidateStage2AfterSave"/>
284+
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage2AfterSave">
285+
<argument name="page" value="ProductsOnStage"/>
286+
<argument name="count" value="4"/>
287+
</actionGroup>
288+
<actionGroup ref="validateProductInProductsOnStage" stepKey="validateProductsStage2AfterSave">
289+
<argument name="page" value="ProductsOnStage"/>
290+
</actionGroup>
254291
<actionGroup ref="ClearCacheActionGroup" stepKey="clearMagentoCache"/>
255292
<!-- Switch Back To Frontend -->
256293
<comment userInput="Switch Back To Frontend" stepKey="commentSwitchToFrontend"/>
@@ -261,7 +298,7 @@
261298
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront2"/>
262299
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStorefront2">
263300
<argument name="page" value="ProductsOnStorefront"/>
264-
<argument name="count" value="2"/>
301+
<argument name="count" value="4"/>
265302
</actionGroup>
266303
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStorefront2">
267304
<argument name="page" value="ProductsOnStorefront"/>

0 commit comments

Comments
 (0)