Skip to content

Commit c070d28

Browse files
dhaeckerdhaecker
committed
PB-107: Display total number of products matched into ProductsList
- Updating MFTF test: AdminPageBuilderProductsConfigurationValidateProductTotals
1 parent 9ad10b6 commit c070d28

File tree

3 files changed

+93
-86
lines changed

3 files changed

+93
-86
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,10 @@
489489
</actionGroup>
490490
<actionGroup name="validateProductTotals">
491491
<arguments>
492-
<argument name="property"/>
492+
<argument name="productsTotals" defaultValue="of 1 (0 disabled)" type="string"/>
493493
</arguments>
494494
<waitForPageLoad stepKey="waitForPageLoad"/>
495-
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
496-
<see selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="seeProductTotals"/>
495+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsTotalProductsProperty.section, PageBuilderProductsTotalProductsProperty.fieldName)}}" stepKey="waitForFieldVisible"/>
496+
<see selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsTotalProductsProperty.section, PageBuilderProductsTotalProductsProperty.fieldName)}}" userInput="{{productsTotals}}" stepKey="seeProductTotals"/>
497497
</actionGroup>
498498
</actionGroups>

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,6 @@
162162
<data key="value"/>
163163
<data key="errorMessage">This is a required field.</data>
164164
</entity>
165-
<entity name="PageBuilderTotalProductsPropertyThree" type="pagebuilder_products_grid_total_products">
166-
<data key="section">appearance_fieldset</data>
167-
<data key="fieldName">product_totals</data>
168-
<data key="value">of 3 (0 disabled)</data>
169-
</entity>
170-
<entity name="PageBuilderTotalProductsPropertyOne" type="pagebuilder_products_grid_total_products">
171-
<data key="section">appearance_fieldset</data>
172-
<data key="fieldName">product_totals</data>
173-
<data key="value">of 1 (0 disabled)</data>
174-
</entity>
175-
<entity name="PageBuilderTotalProductsPropertyTwoOneDisabled" type="pagebuilder_products_grid_total_products">
176-
<data key="section">appearance_fieldset</data>
177-
<data key="fieldName">product_totals</data>
178-
<data key="value">of 2 (1 disabled)</data>
179-
</entity>
180165
<!-- Number of Products to Display: Carousel Appearance -->
181166
<entity name="PageBuilderProductsCarouselCountPropertyOne" type="pagebuilder_products_carousel_number_of_products">
182167
<data key="name">Number of Products to Display</data>
@@ -248,6 +233,11 @@
248233
<data key="value"/>
249234
<data key="errorMessage">This is a required field.</data>
250235
</entity>
236+
<!-- Total Products -->
237+
<entity name="PageBuilderProductsTotalProductsProperty" type="pagebuilder_products_grid_total_products">
238+
<data key="section">appearance_fieldset</data>
239+
<data key="fieldName">product_totals</data>
240+
</entity>
251241
<!-- Carousel Settings: Carousel Mode -->
252242
<entity name="PageBuilderProductsCarouselSettingsCarouselMode_Default" type="pagebuilder_products_carousel_mode">
253243
<data key="name">Autoplay</data>

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

Lines changed: 85 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,140 +1103,157 @@
11031103
<features value="PageBuilder"/>
11041104
<stories value="Products"/>
11051105
<title value="Validate Product Totals"/>
1106-
<description value="Validate the total number of products shown for the selected conditions in the Advanced Configuration form and on Stage for Product List."/>
1107-
<severity value="CRITICAL"/>
1106+
<description value="Validate the total number of products shown edit form and stage for the Products content type"/>
1107+
<severity value="MAJOR"/>
11081108
<useCaseId value="PB-107"/>
11091109
<testCaseId value="MC-22882"/>
11101110
<group value="pagebuilder"/>
11111111
<group value="pagebuilder-products"/>
11121112
</annotations>
11131113
<before>
1114-
<createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory1"/>
1115-
<createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory2"/>
1116-
<createData entity="_defaultProduct" stepKey="createPreReqProduct1">
1117-
<requiredEntity createDataKey="createPreReqCategory1"/>
1114+
<createData entity="PageBuilderProductsSubCategory" stepKey="createCategory1"/>
1115+
<createData entity="PageBuilderProductsSubCategory" stepKey="createCategory2"/>
1116+
<createData entity="_defaultProduct" stepKey="createCategory1Product1">
1117+
<requiredEntity createDataKey="createCategory1"/>
11181118
</createData>
1119-
<createData entity="_defaultProduct" stepKey="createPreReqProduct2">
1120-
<requiredEntity createDataKey="createPreReqCategory1"/>
1119+
<createData entity="_defaultProduct" stepKey="createCategory1Product2">
1120+
<requiredEntity createDataKey="createCategory1"/>
11211121
</createData>
1122-
<createData entity="_defaultProduct" stepKey="createPreReqProduct3">
1123-
<requiredEntity createDataKey="createPreReqCategory1"/>
1122+
<createData entity="_defaultProduct" stepKey="createCategory1Product3">
1123+
<requiredEntity createDataKey="createCategory1"/>
11241124
</createData>
1125-
<createData entity="_defaultProduct" stepKey="createPreReqProduct4">
1126-
<requiredEntity createDataKey="createPreReqCategory2"/>
1127-
</createData>
1128-
<createData entity="SimpleProductDisabled" stepKey="createPreReqProduct5">
1125+
<createData entity="_defaultProduct" stepKey="createCategory2Product">
1126+
<requiredEntity createDataKey="createCategory2"/>
11291127
</createData>
1128+
<createData entity="SimpleProductDisabled" stepKey="createDisabledProduct"/>
1129+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
11301130
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1131-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1131+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
1132+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1133+
</actionGroup>
11321134
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
11331135
</before>
11341136
<after>
1135-
<deleteData createDataKey="createPreReqProduct1" stepKey="deletePreReqProduct1"/>
1136-
<deleteData createDataKey="createPreReqProduct2" stepKey="deletePreReqProduct2"/>
1137-
<deleteData createDataKey="createPreReqProduct3" stepKey="deletePreReqProduct3"/>
1138-
<deleteData createDataKey="createPreReqProduct4" stepKey="deletePreReqProduct4"/>
1139-
<deleteData createDataKey="createPreReqProduct5" stepKey="deletePreReqProduct5"/>
1140-
<deleteData createDataKey="createPreReqCategory1" stepKey="deletePreReqCategory1"/>
1141-
<deleteData createDataKey="createPreReqCategory2" stepKey="deletePreReqCategory2"/>
1137+
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
1138+
<deleteData createDataKey="createCategory2" stepKey="deleteCategory2"/>
1139+
<deleteData createDataKey="createCategory1Product1" stepKey="deleteCategory1Product1"/>
1140+
<deleteData createDataKey="createCategory1Product2" stepKey="deleteCategory1Product2"/>
1141+
<deleteData createDataKey="createCategory1Product3" stepKey="deleteCategory1Product3"/>
1142+
<deleteData createDataKey="createCategory2Product" stepKey="deleteCategory2Product"/>
1143+
<deleteData createDataKey="createDisabledProduct" stepKey="deleteDisabledProduct"/>
1144+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
11421145
<actionGroup ref="logout" stepKey="logout"/>
11431146
</after>
1144-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1145-
<argument name="contentType" value="PageBuilderProductsContentType"/>
1146-
</actionGroup>
11471147
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
11481148
<argument name="contentType" value="PageBuilderProductsContentType"/>
11491149
</actionGroup>
11501150
<actionGroup ref="dragContentTypeToStage" stepKey="dragProductsIntoStage">
11511151
<argument name="contentType" value="PageBuilderProductsContentType"/>
11521152
</actionGroup>
1153-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1153+
<!-- Verify Total Products by Category for Grid Appearance -->
1154+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel1">
11541155
<argument name="contentType" value="PageBuilderProductsContentType"/>
11551156
</actionGroup>
1156-
<!-- Select Products By Category -->
1157-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectGridAppearanceForCategory">
1157+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectGridAppearance">
11581158
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
11591159
</actionGroup>
11601160
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsByCategory">
11611161
<argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
11621162
</actionGroup>
11631163
<actionGroup ref="selectCategoryFromCategoryDropDown" stepKey="selectCategory">
1164-
<argument name="category" value="$$createPreReqCategory1.name$$"/>
1164+
<argument name="category" value="$$createCategory1.name$$"/>
11651165
</actionGroup>
1166-
<!-- Verify Total Products by Category for Grid Appearance -->
1167-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForCategoryAndGrid">
1168-
<argument name="property" value="PageBuilderTotalProductsPropertyThree"/>
1166+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel1">
1167+
<argument name="productsTotals" value="of 3 (0 disabled)"/>
11691168
</actionGroup>
1170-
<actionGroup ref="saveEditPanelSettings" stepKey="saveValidationEditPanelSettings"/>
1171-
<!-- Validate Stage -->
1172-
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageForCategoryAndGrid">
1169+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1"/>
1170+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage1">
11731171
<argument name="page" value="ProductsOnStage"/>
11741172
<argument name="count" value="3"/>
11751173
</actionGroup>
1176-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterVerifyingStageForCategoryAndGrid">
1174+
<!-- Verify Total Products by Category for Carousel Appearance -->
1175+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel2">
11771176
<argument name="contentType" value="PageBuilderProductsContentType"/>
11781177
</actionGroup>
1179-
<!-- Verify Total Products by Category for Carousel Appearance -->
11801178
<actionGroup ref="chooseVisualSelectOption" stepKey="selectCarouselAppearance">
11811179
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
11821180
</actionGroup>
1183-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForCategoryAndCarousel">
1184-
<argument name="property" value="PageBuilderTotalProductsPropertyThree"/>
1181+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel2">
1182+
<argument name="productsTotals" value="of 3 (0 disabled)"/>
11851183
</actionGroup>
1186-
<!-- Select Products By Sku -->
1187-
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBySku">
1184+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel2"/>
1185+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage2">
1186+
<argument name="page" value="ProductsCarouselOnStage"/>
1187+
<argument name="count" value="3"/>
1188+
</actionGroup>
1189+
<!-- Verify Total Products by SKU for Carousel Appearance -->
1190+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel3">
1191+
<argument name="contentType" value="PageBuilderProductsContentType"/>
1192+
</actionGroup>
1193+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBySKU">
11881194
<argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
11891195
</actionGroup>
1190-
<actionGroup ref="addSKUsToSelectProductsBySKU" stepKey="addProductsSKUsToInputField">
1191-
<argument name="SKUs" value="$$createPreReqProduct5.sku$$,$$createPreReqProduct1.sku$$"/>
1196+
<actionGroup ref="addSKUsToSelectProductsBySKU" stepKey="addProductsSKUsToInputField3">
1197+
<argument name="SKUs" value="$$createDisabledProduct.sku$$,$$createCategory1Product1.sku$$"/>
11921198
</actionGroup>
1193-
<!-- Verify Total Products by Sku for Carousel Appearance -->
1194-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForSkusAndCarousel">
1195-
<argument name="property" value="PageBuilderTotalProductsPropertyTwoOneDisabled"/>
1199+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel3">
1200+
<argument name="productsTotals" value="of 2 (1 disabled)"/>
11961201
</actionGroup>
1197-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsForSkuAndCarousel"/>
1198-
<!-- Validate Stage -->
1199-
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageForSkuAndCarousel">
1202+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel3"/>
1203+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage3">
12001204
<argument name="page" value="ProductsCarouselOnStage"/>
12011205
<argument name="count" value="1"/>
12021206
</actionGroup>
1203-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterVerifyingStageForSkuAndCarousel">
1207+
<!-- Verify Total Products by SKU for Grid Appearance -->
1208+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel4">
12041209
<argument name="contentType" value="PageBuilderProductsContentType"/>
12051210
</actionGroup>
1206-
<!-- Verify Total Products by Sku for Grid Appearance -->
1207-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectGridAppearanceForSku">
1211+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectGridAppearance2">
12081212
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
12091213
</actionGroup>
1210-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForSkuAndGrid">
1211-
<argument name="property" value="PageBuilderTotalProductsPropertyTwoOneDisabled"/>
1214+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel4">
1215+
<argument name="productsTotals" value="of 2 (1 disabled)"/>
1216+
</actionGroup>
1217+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel4"/>
1218+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage4">
1219+
<argument name="page" value="ProductsOnStage"/>
1220+
<argument name="count" value="1"/>
1221+
</actionGroup>
1222+
<!-- Verify Total Products by Condition for Grid Appearance -->
1223+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel5">
1224+
<argument name="contentType" value="PageBuilderProductsContentType"/>
12121225
</actionGroup>
1213-
<!-- Select Products By Condition -->
12141226
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsByCondition">
12151227
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
12161228
</actionGroup>
12171229
<actionGroup ref="addConditionToProductConditions" stepKey="addCategoryCondition">
1218-
<argument name="conditionInput" value="$$createPreReqCategory2.id$$"/>
1230+
<argument name="conditionInput" value="$$createCategory2.id$$"/>
12191231
</actionGroup>
1220-
<click selector="{{ProductsContentTypeForm.conditionsListText}}" stepKey="clickOutOfConditionField"/>
1221-
<!-- Verify Total Products by Condition for Grid Appearance -->
1222-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForConditionAndGrid">
1223-
<argument name="property" value="PageBuilderTotalProductsPropertyOne"/>
1232+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy">
1233+
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
12241234
</actionGroup>
1225-
<actionGroup ref="saveEditPanelSettings" stepKey="saveValidationEditPanelSettingsForConditionAndGrid"/>
1226-
<!-- Validate Stage -->
1227-
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageForConditionAndGrid">
1235+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel5">
1236+
<argument name="productsTotals" value="of 1 (0 disabled)"/>
1237+
</actionGroup>
1238+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel5"/>
1239+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage5">
12281240
<argument name="page" value="ProductsOnStage"/>
12291241
<argument name="count" value="1"/>
12301242
</actionGroup>
1231-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterVerifyingStageForConditionAndGrid">
1243+
<!-- Verify Total Products by Condition for Carousel Appearance -->
1244+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel6">
12321245
<argument name="contentType" value="PageBuilderProductsContentType"/>
12331246
</actionGroup>
1234-
<!-- Verify Total Products by Condition for Carousel Appearance -->
1235-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectCarouselAppearanceForCondition">
1247+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectCarouselAppearance2">
12361248
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
12371249
</actionGroup>
1238-
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsForConditionAndCarousel">
1239-
<argument name="property" value="PageBuilderTotalProductsPropertyOne"/>
1250+
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel6">
1251+
<argument name="productsTotals" value="of 1 (0 disabled)"/>
1252+
</actionGroup>
1253+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel6"/>
1254+
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage6">
1255+
<argument name="page" value="ProductsCarouselOnStage"/>
1256+
<argument name="count" value="1"/>
12401257
</actionGroup>
12411258
</test>
12421259
</tests>

0 commit comments

Comments
 (0)