Skip to content

Commit ad2025b

Browse files
dhaeckerdhaecker
committed
MC-18338: Pulling products from single category into ProductList and sort them by product position in the Category
- Updating MFTF test to pass after changes to position new products first - Adding MFTF test for deleting Category & checking products content type
1 parent 3900bff commit ad2025b

File tree

2 files changed

+54
-16
lines changed

2 files changed

+54
-16
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"><!-- Product Entity -->
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="PageBuilderProductsMessage" type="pagebuilder_products_messages">
12+
<data key="noProductsFound">No products were found matching your condition</data>
13+
</entity>
14+
<!-- Product Entity -->
1115
<entity name="PageBuilderProductsSubCategory" type="category">
1216
<data key="name" unique="suffix">PageBuilderProductsSubCategory</data>
1317
<data key="is_active">true</data>

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

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@
16821682
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterChangingToFalse"/>
16831683
<!-- Validate Stage After Changing to False -->
16841684
<comment userInput="Validate Stage Changing to False" stepKey="commentValidateStageAfterChangingToFalse"/>
1685-
<seeElement selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="validateProductCountStageAfterChangingToFalse"/>
1685+
<see userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="validateProductCountStageAfterChangingToFalse"/>
16861686
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
16871687
<!-- Validate Storefront 2 -->
16881688
<comment userInput="Validate Storefront 2" stepKey="commentValidateStorefrontAfterChangingToFalse"/>
@@ -1936,12 +1936,12 @@
19361936
</actionGroup>
19371937
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage">
19381938
<argument name="page" value="ProductsOnStage"/>
1939-
<argument name="product" value="SortProduct1"/>
1939+
<argument name="product" value="SortProduct2"/>
19401940
<argument name="productIndex" value="1"/>
19411941
</actionGroup>
19421942
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage">
19431943
<argument name="page" value="ProductsOnStage"/>
1944-
<argument name="product" value="SortProduct2"/>
1944+
<argument name="product" value="SortProduct1"/>
19451945
<argument name="productIndex" value="2"/>
19461946
</actionGroup>
19471947
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -1956,13 +1956,13 @@
19561956
</actionGroup>
19571957
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Storefront">
19581958
<argument name="page" value="ProductsOnStorefront"/>
1959-
<argument name="product" value="SortProduct1"/>
1959+
<argument name="product" value="SortProduct2"/>
19601960
<argument name="productIndex" value="1"/>
19611961
<argument name="isClickable" value="auto"/>
19621962
</actionGroup>
19631963
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Storefront">
19641964
<argument name="page" value="ProductsOnStorefront"/>
1965-
<argument name="product" value="SortProduct2"/>
1965+
<argument name="product" value="SortProduct1"/>
19661966
<argument name="productIndex" value="2"/>
19671967
<argument name="isClickable" value="auto"/>
19681968
</actionGroup>
@@ -1971,8 +1971,8 @@
19711971
<annotations>
19721972
<features value="PageBuilder"/>
19731973
<stories value="Products"/>
1974-
<title value="Verify Updating Product Position In Category Propogates Change to Page Builder Products Content Type"/>
1975-
<description value="Ensure products content type can be set to select products by category and sorted by position"/>
1974+
<title value="Verify Updating Product Position In Category Propagates Change to Page Builder Products Content Type"/>
1975+
<description value="Ensure updating product positions in categories will propagate position changes to the page builder products content type"/>
19761976
<severity value="CRITICAL"/>
19771977
<useCaseId value="MC-18338"/>
19781978
<testCaseId value="MC-20159"/>
@@ -1989,10 +1989,14 @@
19891989
<argument name="sectionDependentSelector" value="{{AdminCategoryContentSection.productTableRow}}"/>
19901990
</actionGroup>
19911991
<waitForElementVisible selector="{{AdminCategoryProductsGridSection.rowPosition('1')}}" stepKey="waitForPositionFieldForProduct1" after="expandAdminCategorySection"/>
1992-
<fillField selector="{{AdminCategoryProductsGridSection.rowPosition('1')}}" userInput="1" stepKey="changePositionForProduct1" after="waitForPositionFieldForProduct1"/>
1993-
<waitForElementVisible selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" stepKey="waitForPositionFieldForProduct2" after="changePositionForProduct1"/>
1994-
<fillField selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" userInput="2" stepKey="changePositionForProduct2" after="waitForPositionFieldForProduct2"/>
1995-
<actionGroup ref="saveCatalogCategory" stepKey="saveCatalogCategory" after="changePositionForProduct2"/>
1992+
<pressKey selector="{{AdminCategoryProductsGridSection.rowPosition('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="clearPositionValueForProduct1" after="waitForPositionFieldForProduct1"/>
1993+
<fillField selector="{{AdminCategoryProductsGridSection.rowPosition('1')}}" userInput="2" stepKey="changePositionForProduct1" after="clearPositionValueForProduct1"/>
1994+
<pressKey selector="{{AdminCategoryProductsGridSection.rowPosition('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enterPositionValueForProduct1" after="changePositionForProduct1"/>
1995+
<waitForElementVisible selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" stepKey="waitForPositionFieldForProduct2" after="enterPositionValueForProduct1"/>
1996+
<pressKey selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="clearPositionValueForProduct2" after="waitForPositionFieldForProduct2"/>
1997+
<fillField selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" userInput="1" stepKey="changePositionForProduct2" after="clearPositionValueForProduct2"/>
1998+
<pressKey selector="{{AdminCategoryProductsGridSection.rowPosition('2')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enterPositionValueForProduct2" after="changePositionForProduct2"/>
1999+
<actionGroup ref="saveCatalogCategory" stepKey="saveCatalogCategory" after="enterPositionValueForProduct2"/>
19962000
<!-- Stage: Validate Sort Order Changed -->
19972001
<comment userInput="Stage: Validate Sort Order Changed" stepKey="commentValidateStage2" after="saveCatalogCategory"/>
19982002
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage2" after="commentValidateStage2">
@@ -2006,12 +2010,12 @@
20062010
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage2" after="validateProductsCountStage2">
20072011
<argument name="page" value="ProductsOnStage"/>
20082012
<argument name="product" value="SortProduct1"/>
2009-
<argument name="productIndex" value="2"/>
2013+
<argument name="productIndex" value="1"/>
20102014
</actionGroup>
20112015
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage2" after="validateProduct1Stage2">
20122016
<argument name="page" value="ProductsOnStage"/>
20132017
<argument name="product" value="SortProduct2"/>
2014-
<argument name="productIndex" value="1"/>
2018+
<argument name="productIndex" value="2"/>
20152019
</actionGroup>
20162020
<!-- Storefront: Validate Sort Order Changed -->
20172021
<comment userInput="Storefront: Validate Sort Order Changed" stepKey="commentValidateStorefront2" after="validateProduct2Stage2"/>
@@ -2025,14 +2029,44 @@
20252029
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Storefront2" after="validateProductCountStorefront2">
20262030
<argument name="page" value="ProductsOnStorefront"/>
20272031
<argument name="product" value="SortProduct1"/>
2028-
<argument name="productIndex" value="2"/>
2032+
<argument name="productIndex" value="1"/>
20292033
<argument name="isClickable" value="auto"/>
20302034
</actionGroup>
20312035
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Storefront2" after="validateProduct1Storefront2">
20322036
<argument name="page" value="ProductsOnStorefront"/>
20332037
<argument name="product" value="SortProduct2"/>
2034-
<argument name="productIndex" value="1"/>
2038+
<argument name="productIndex" value="2"/>
20352039
<argument name="isClickable" value="auto"/>
20362040
</actionGroup>
20372041
</test>
2042+
<test name="AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategory" extends="AdminPageBuilderProductsSelectByCategoryAndSortByPosition">
2043+
<annotations>
2044+
<features value="PageBuilder"/>
2045+
<stories value="Products"/>
2046+
<title value="Verify Deleting Category Propagates Change to Page Builder Products Content Type"/>
2047+
<description value="Ensure that deleting a category that a products content type is tied to will cause the products content type to not render any products"/>
2048+
<severity value="CRITICAL"/>
2049+
<useCaseId value="MC-18338"/>
2050+
<testCaseId value="MC-20205"/>
2051+
<group value="pagebuilder"/>
2052+
<group value="pagebuilder-products"/>
2053+
</annotations>
2054+
<after>
2055+
<remove keyForRemoval="deleteCategory1"/>
2056+
</after>
2057+
<!-- Delete Category -->
2058+
<comment userInput="Delete Category" stepKey="commentDeleteCategory" after="validateProduct2Storefront"/>
2059+
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1" after="commentDeleteCategory"/>
2060+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage2" after="deleteCategory1">
2061+
<argument name="CMSPage" value="$$createCMSPage$$"/>
2062+
</actionGroup>
2063+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2" after="navigateToCMSPage2"/>
2064+
<see userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="seeNoProductsMessage" after="switchToPageBuilderStage2"/>
2065+
<!-- Storefront: Validate Sort Order Changed -->
2066+
<comment userInput="Storefront: Validate Sort Order Changed" stepKey="commentValidateStorefront2" after="seeNoProductsMessage"/>
2067+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToCMSPageStorefront2" after="commentValidateStorefront2">
2068+
<argument name="page" value="$$createCMSPage.identifier$$"/>
2069+
</actionGroup>
2070+
<dontSeeElementInDOM selector="{{ProductsOnStorefront.product('1')}}" stepKey="validateNoProductsOnStorefront" after="navigateToCMSPageStorefront2"/>
2071+
</test>
20382072
</tests>

0 commit comments

Comments
 (0)