Skip to content

Commit 3f1b5e0

Browse files
author
Hwashiang Yu
committed
MC-15093: Buttons From Different Button Groups Merge Onto Same Line When in Full-Width Row
- Added test coverage for button group heights on storefront
1 parent 1ea8269 commit 3f1b5e0

File tree

2 files changed

+174
-0
lines changed

2 files changed

+174
-0
lines changed

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,4 +1984,106 @@
19841984
</actionGroup>
19851985
<seeNumberOfElements selector="{{ProductsOnStorefront.product('1')}}" userInput="1" stepKey="seeOneProduct" />
19861986
</test>
1987+
<test name="ButtonGroupInBlockOnDifferentLineWhenInFullWidthRow">
1988+
<annotations>
1989+
<features value="PageBuilder"/>
1990+
<stories value="Block"/>
1991+
<title value="Buttons In Block From Different Button Groups On Different Line When in Full-Width Row"/>
1992+
<description value="Button groups in block should be on different lines when in full-width row"/>
1993+
<severity value="Critical"/>
1994+
<useCaseId value="MC-15093"/>
1995+
<testCaseId value=""/>
1996+
<group value="pagebuilder"/>
1997+
<group value="pagebuilder-buttons"/>
1998+
<group value="pagebuilder-buttonGroup"/>
1999+
<group value="pagebuilder-block"/>
2000+
</annotations>
2001+
<before>
2002+
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock"/>
2003+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2004+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2005+
</before>
2006+
<after>
2007+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
2008+
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
2009+
<actionGroup ref="logout" stepKey="logout"/>
2010+
</after>
2011+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlock">
2012+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2013+
</actionGroup>
2014+
<!-- Change row appearance to full-width -->
2015+
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
2016+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
2017+
<argument name="contentType" value="PageBuilderRowContentType"/>
2018+
</actionGroup>
2019+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowBlock">
2020+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
2021+
</actionGroup>
2022+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowBlock"/>
2023+
<!-- Add button groups to block -->
2024+
<comment userInput="Add button groups to block" stepKey="commentAddButtonGroupsToBlock"/>
2025+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionBlock">
2026+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2027+
</actionGroup>
2028+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStageBlock">
2029+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2030+
</actionGroup>
2031+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuBlock">
2032+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
2033+
</actionGroup>
2034+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Block">
2035+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
2036+
</actionGroup>
2037+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Block">
2038+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
2039+
</actionGroup>
2040+
<!-- Validate Block -->
2041+
<comment userInput="Validate Block" stepKey="commentValidateBlock"/>
2042+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Block"/>
2043+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Block"/>
2044+
<assertNotEquals stepKey="checkYCoordinatesBlock">
2045+
<expectedResult type="variable">yCoordinate1Block</expectedResult>
2046+
<actualResult type="variable">yCoordinate2Block</actualResult>
2047+
</assertNotEquals>
2048+
<actionGroup ref="saveAndCloseCMSBlockWithSplitButton" stepKey="saveAndCloseCMSBlockWithSplitButton"/>
2049+
<!-- Go to CMS Page and choose Block -->
2050+
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
2051+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
2052+
<argument name="CMSPage" value="$$createCMSPage$$"/>
2053+
</actionGroup>
2054+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
2055+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContentPage">
2056+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2057+
</actionGroup>
2058+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStagePage">
2059+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2060+
</actionGroup>
2061+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDropPage">
2062+
<argument name="contentType" value="PageBuilderBlockContentType"/>
2063+
</actionGroup>
2064+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGridPage">
2065+
<argument name="block" value="$$createPreReqBlock$$"/>
2066+
</actionGroup>
2067+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsPage"/>
2068+
<!-- Validate Page -->
2069+
<comment userInput="Validate Page" stepKey="commentValidatePage"/>
2070+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Page"/>
2071+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Page"/>
2072+
<assertNotEquals stepKey="checkYCoordinatesPage">
2073+
<expectedResult type="variable">yCoordinate1Page</expectedResult>
2074+
<actualResult type="variable">yCoordinate2Page</actualResult>
2075+
</assertNotEquals>
2076+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
2077+
<!-- Validate CMS Page Storefront -->
2078+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
2079+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToProductStorefront">
2080+
<argument name="page" value="$$createCMSPage.identifier$$"/>
2081+
</actionGroup>
2082+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Storefront"/>
2083+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Storefront"/>
2084+
<assertNotEquals stepKey="checkYCoordinatesStorefront">
2085+
<expectedResult type="variable">yCoordinate1Storefront</expectedResult>
2086+
<actualResult type="variable">yCoordinate2Storefront</actualResult>
2087+
</assertNotEquals>
2088+
</test>
19872089
</tests>

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,4 +1132,76 @@
11321132
</actionGroup>
11331133
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1" after="enterAppearance"/>
11341134
</test>
1135+
<test name="ButtonGroupOnDifferentLineWhenInFullWidthRow">
1136+
<annotations>
1137+
<features value="PageBuilder"/>
1138+
<stories value="Buttons"/>
1139+
<title value="Buttons From Different Button Groups On Different Line When in Full-Width Row"/>
1140+
<description value="Button groups should be on different lines when in full-width row"/>
1141+
<severity value="Critical"/>
1142+
<useCaseId value="MC-15093"/>
1143+
<testCaseId value=""/>
1144+
<group value="pagebuilder"/>
1145+
<group value="pagebuilder-buttons"/>
1146+
<group value="pagebuilder-buttonGroup"/>
1147+
</annotations>
1148+
<before>
1149+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
1150+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1151+
</before>
1152+
<after>
1153+
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
1154+
<actionGroup ref="logout" stepKey="logout"/>
1155+
</after>
1156+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
1157+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1158+
</actionGroup>
1159+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
1160+
<!-- Change row appearance to full-width -->
1161+
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
1162+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
1163+
<argument name="contentType" value="PageBuilderRowContentType"/>
1164+
</actionGroup>
1165+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowBlock">
1166+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1167+
</actionGroup>
1168+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowBlock"/>
1169+
<!-- Add button groups to block -->
1170+
<comment userInput="Add button groups to block" stepKey="commentAddButtonGroupsToBlock"/>
1171+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionBlock">
1172+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1173+
</actionGroup>
1174+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStageBlock">
1175+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1176+
</actionGroup>
1177+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuBlock">
1178+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1179+
</actionGroup>
1180+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Block">
1181+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1182+
</actionGroup>
1183+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Block">
1184+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1185+
</actionGroup>
1186+
<!-- Validate Page -->
1187+
<comment userInput="Validate Page" stepKey="commentValidatePage"/>
1188+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Block"/>
1189+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Block"/>
1190+
<assertNotEquals stepKey="checkYCoordinatesBlock">
1191+
<expectedResult type="variable">yCoordinate1Block</expectedResult>
1192+
<actualResult type="variable">yCoordinate2Block</actualResult>
1193+
</assertNotEquals>
1194+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1195+
<!-- Validate CMS Page Storefront -->
1196+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1197+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToProductStorefront">
1198+
<argument name="page" value="$$createCMSPage.identifier$$"/>
1199+
</actionGroup>
1200+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Storefront"/>
1201+
<executeJS function="return {{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Storefront"/>
1202+
<assertNotEquals stepKey="checkYCoordinatesStorefront">
1203+
<expectedResult type="variable">yCoordinate1Storefront</expectedResult>
1204+
<actualResult type="variable">yCoordinate2Storefront</actualResult>
1205+
</assertNotEquals>
1206+
</test>
11351207
</tests>

0 commit comments

Comments
 (0)