Skip to content

Commit ca28c33

Browse files
author
Hwashiang Yu
committed
MC-15093: Buttons From Different Button Groups Merge Onto Same Line When in Full-Width Row
- Updated test stepkeys - Moved test steps to before section
1 parent a6ec9fd commit ca28c33

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,20 +1997,21 @@
19971997
<group value="pagebuilder-buttons"/>
19981998
<group value="pagebuilder-buttonGroup"/>
19991999
<group value="pagebuilder-block"/>
2000+
<group value="pagebuilder-row"/>
20002001
</annotations>
20012002
<before>
20022003
<createData entity="_emptyCmsBlock" stepKey="createPreReqBlock"/>
20032004
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
20042005
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2006+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlock">
2007+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2008+
</actionGroup>
20052009
</before>
20062010
<after>
20072011
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
20082012
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
20092013
<actionGroup ref="logout" stepKey="logout"/>
20102014
</after>
2011-
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlock">
2012-
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
2013-
</actionGroup>
20142015
<!-- Change row appearance to full-width -->
20152016
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
20162017
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
@@ -2045,7 +2046,7 @@
20452046
<expectedResult type="variable">yCoordinate1Block</expectedResult>
20462047
<actualResult type="variable">yCoordinate2Block</actualResult>
20472048
</assertNotEquals>
2048-
<actionGroup ref="saveAndCloseCMSBlockWithSplitButton" stepKey="saveAndCloseCMSBlockWithSplitButton"/>
2049+
<actionGroup ref="saveAndCloseCMSBlockWithSplitButton" stepKey="saveCMSBlock"/>
20492050
<!-- Go to CMS Page and choose Block -->
20502051
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
20512052
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,54 +1144,55 @@
11441144
<group value="pagebuilder"/>
11451145
<group value="pagebuilder-buttons"/>
11461146
<group value="pagebuilder-buttonGroup"/>
1147+
<group value="pagebuilder-row"/>
11471148
</annotations>
11481149
<before>
11491150
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
11501151
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1152+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
1153+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1154+
</actionGroup>
1155+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
11511156
</before>
11521157
<after>
11531158
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
11541159
<actionGroup ref="logout" stepKey="logout"/>
11551160
</after>
1156-
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
1157-
<argument name="CMSPage" value="$$createCMSPage$$"/>
1158-
</actionGroup>
1159-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStagePage"/>
11601161
<!-- Change row appearance to full-width -->
1161-
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
1162-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
1162+
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearance"/>
1163+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStage">
11631164
<argument name="contentType" value="PageBuilderRowContentType"/>
11641165
</actionGroup>
1165-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowBlock">
1166+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow">
11661167
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
11671168
</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">
1169+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
1170+
<!-- Add button groups to row -->
1171+
<comment userInput="Add button groups to row" stepKey="commentAddButtonGroupsToRow"/>
1172+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionButtons">
11721173
<argument name="contentType" value="PageBuilderButtonsContentType"/>
11731174
</actionGroup>
1174-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStageBlock">
1175+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsContentTypeToStage">
11751176
<argument name="contentType" value="PageBuilderButtonsContentType"/>
11761177
</actionGroup>
1177-
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuBlock">
1178+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuButtons">
11781179
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
11791180
</actionGroup>
1180-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Block">
1181+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2Buttons">
11811182
<argument name="contentType" value="PageBuilderButtonsContentType"/>
11821183
</actionGroup>
1183-
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Block">
1184+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu2Buttons">
11841185
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
11851186
</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>
1187+
<!-- Validate Stage -->
1188+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1189+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('1')}}.getBoundingClientRect().y" stepKey="yCoordinate1Stage"/>
1190+
<executeJS function="return {{ButtonItemOnStage.jsButtonSelector('2')}}.getBoundingClientRect().y" stepKey="yCoordinate2Stage"/>
1191+
<assertNotEquals stepKey="checkYCoordinatesStage">
1192+
<expectedResult type="variable">yCoordinate1Stage</expectedResult>
1193+
<actualResult type="variable">yCoordinate2Stage</actualResult>
11931194
</assertNotEquals>
1194-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1195+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsStage"/>
11951196
<!-- Validate CMS Page Storefront -->
11961197
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11971198
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToProductStorefront">

0 commit comments

Comments
 (0)