Skip to content

Commit 7a98308

Browse files
dhaeckerdhaecker
committed
PB-107: Display total number of products matched into ProductsList
- Fixing AdminPageBuilderProductsConfigurationValidateProductTotals MFTF test
1 parent 8cfd519 commit 7a98308

File tree

3 files changed

+50
-16
lines changed

3 files changed

+50
-16
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@
497497
</actionGroup>
498498
<actionGroup name="validateProductTotals">
499499
<arguments>
500-
<argument name="productsTotals" defaultValue="of 0 (0 disabled)" type="string"/>
500+
<argument name="productsTotals" defaultValue="of 0 total" type="string"/>
501501
</arguments>
502502
<waitForPageLoad stepKey="waitForPageLoad"/>
503503
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsTotalProductsProperty.section, PageBuilderProductsTotalProductsProperty.fieldName)}}" stepKey="waitForFieldVisible"/>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,28 @@
4040
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
4141
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
4242
</entity>
43+
<entity name="SimpleProductDisabled2" type="product">
44+
<data key="sku" unique="suffix">simple_product_disabled</data>
45+
<data key="type_id">simple</data>
46+
<data key="attribute_set_id">4</data>
47+
<data key="name" unique="suffix">Simple Product Disabled</data>
48+
<data key="price">123.00</data>
49+
<data key="visibility">4</data>
50+
<data key="status">2</data>
51+
<data key="quantity">1001</data>
52+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
53+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
54+
</entity>
55+
<entity name="SimpleProductNotVisibleIndividually2" type="product">
56+
<data key="sku" unique="suffix">simple_product_not_visible_individually</data>
57+
<data key="type_id">simple</data>
58+
<data key="attribute_set_id">4</data>
59+
<data key="name" unique="suffix">Simple Product Not Visible Individually</data>
60+
<data key="price">123.00</data>
61+
<data key="visibility">1</data>
62+
<data key="status">1</data>
63+
<data key="quantity">1000</data>
64+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
65+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
66+
</entity>
4367
</entities>

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

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,19 +1113,27 @@
11131113
<before>
11141114
<createData entity="PageBuilderProductsSubCategory" stepKey="createCategory1"/>
11151115
<createData entity="PageBuilderProductsSubCategory" stepKey="createCategory2"/>
1116-
<createData entity="_defaultProduct" stepKey="createCategory1Product1">
1116+
<createData entity="_defaultProduct" stepKey="createProduct1">
11171117
<requiredEntity createDataKey="createCategory1"/>
11181118
</createData>
1119-
<createData entity="_defaultProduct" stepKey="createCategory1Product2">
1119+
<createData entity="_defaultProduct" stepKey="createProduct2">
11201120
<requiredEntity createDataKey="createCategory1"/>
11211121
</createData>
1122-
<createData entity="_defaultProduct" stepKey="createCategory1Product3">
1122+
<createData entity="_defaultProduct" stepKey="createProduct3">
1123+
<requiredEntity createDataKey="createCategory1"/>
1124+
</createData>
1125+
<createData entity="SimpleProduct4" stepKey="createOutOfStockProduct">
1126+
<requiredEntity createDataKey="createCategory1"/>
1127+
</createData>
1128+
<createData entity="SimpleProductNotVisibleIndividually2" stepKey="createNotVisibleProduct">
1129+
<requiredEntity createDataKey="createCategory1"/>
1130+
</createData>
1131+
<createData entity="SimpleProductDisabled2" stepKey="createDisabledProduct">
11231132
<requiredEntity createDataKey="createCategory1"/>
11241133
</createData>
11251134
<createData entity="_defaultProduct" stepKey="createCategory2Product">
11261135
<requiredEntity createDataKey="createCategory2"/>
11271136
</createData>
1128-
<createData entity="SimpleProductDisabled" stepKey="createDisabledProduct"/>
11291137
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
11301138
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
11311139
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
@@ -1136,11 +1144,13 @@
11361144
<after>
11371145
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
11381146
<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"/>
1147+
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
1148+
<deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
1149+
<deleteData createDataKey="createProduct3" stepKey="deleteProduct3"/>
1150+
<deleteData createDataKey="createOutOfStockProduct" stepKey="deleteOutOfStockProduct"/>
1151+
<deleteData createDataKey="createNotVisibleProduct" stepKey="deleteNotVisibleProduct"/>
11431152
<deleteData createDataKey="createDisabledProduct" stepKey="deleteDisabledProduct"/>
1153+
<deleteData createDataKey="createCategory2Product" stepKey="deleteCategory2Product"/>
11441154
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
11451155
<actionGroup ref="logout" stepKey="logout"/>
11461156
</after>
@@ -1165,7 +1175,7 @@
11651175
<argument name="category" value="$$createCategory1.name$$"/>
11661176
</actionGroup>
11671177
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanelAgain1">
1168-
<argument name="productsTotals" value="of 3 (0 disabled)"/>
1178+
<argument name="productsTotals" value="of 6 total (1 disabled, 1 not visible, 1 out of stock)"/>
11691179
</actionGroup>
11701180
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1"/>
11711181
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage1">
@@ -1180,7 +1190,7 @@
11801190
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
11811191
</actionGroup>
11821192
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel2">
1183-
<argument name="productsTotals" value="of 3 (0 disabled)"/>
1193+
<argument name="productsTotals" value="of 6 total (1 disabled, 1 not visible, 1 out of stock)"/>
11841194
</actionGroup>
11851195
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel2"/>
11861196
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage2">
@@ -1196,10 +1206,10 @@
11961206
</actionGroup>
11971207
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel3"/>
11981208
<actionGroup ref="addSKUsToSelectProductsBySKU" stepKey="addProductsSKUsToInputField3">
1199-
<argument name="SKUs" value="$$createDisabledProduct.sku$$,$$createCategory1Product1.sku$$"/>
1209+
<argument name="SKUs" value="$$createDisabledProduct.sku$$,$$createProduct1.sku$$,$$createOutOfStockProduct.sku$$,$$createNotVisibleProduct.sku$$"/>
12001210
</actionGroup>
12011211
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanelAgain3">
1202-
<argument name="productsTotals" value="of 1 (1 disabled)"/>
1212+
<argument name="productsTotals" value="of 4 total (1 disabled, 1 not visible, 1 out of stock)"/>
12031213
</actionGroup>
12041214
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel3"/>
12051215
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage3">
@@ -1214,7 +1224,7 @@
12141224
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
12151225
</actionGroup>
12161226
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel4">
1217-
<argument name="productsTotals" value="of 1 (1 disabled)"/>
1227+
<argument name="productsTotals" value="of 4 total (1 disabled, 1 not visible, 1 out of stock)"/>
12181228
</actionGroup>
12191229
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel4"/>
12201230
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage4">
@@ -1235,7 +1245,7 @@
12351245
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
12361246
</actionGroup>
12371247
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel5">
1238-
<argument name="productsTotals" value="of 1 (0 disabled)"/>
1248+
<argument name="productsTotals" value="of 1 total"/>
12391249
</actionGroup>
12401250
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel5"/>
12411251
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage5">
@@ -1250,7 +1260,7 @@
12501260
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
12511261
</actionGroup>
12521262
<actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel6">
1253-
<argument name="productsTotals" value="of 1 (0 disabled)"/>
1263+
<argument name="productsTotals" value="of 1 total"/>
12541264
</actionGroup>
12551265
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel6"/>
12561266
<actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage6">

0 commit comments

Comments
 (0)