Skip to content

Commit 7220057

Browse files
anthoulaanthoula
committed
MC-4280: Row Vertical Alignment Doesn't Work Inside Block & Dynamic Block
- update action group to use correct padding and offset for block
1 parent 3d03993 commit 7220057

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,23 @@
3939
<actionGroup name="verifyVerticalAlignmentBottomInBlock">
4040
<arguments>
4141
<argument name="block" defaultValue="BlockOnStorefront"/>
42-
<argument name="container" defaultValue="RowOnStorefront"/>
43-
<argument name="content" defaultValue="HtmlOnStorefront"/>
44-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
42+
<argument name="container"/>
43+
<argument name="content"/>
44+
<argument name="minHeight"/>
45+
<argument name="padding"/>
46+
<argument name="index" defaultValue="1" type="string"/>
47+
<!-- Remove storefrontBugOffset when MC-5079 is resolved -->
48+
<argument name="storefrontBugOffset" defaultValue="0" type="string"/>
4549
</arguments>
46-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[0].clientHeight;" stepKey="containerHeight"/>
47-
<executeJS function="return {$containerHeight}-{{padding.paddingTop}}-{{padding.paddingBottom}}" stepKey="minusPadding"/>
48-
<assertEquals stepKey="assertRowHeightEqualsMinHeight">
49-
<expectedResult type="int">{{PageBuilderMinHeightProperty_500.value}}</expectedResult>
50-
<actualResult type="variable">minusPadding</actualResult>
50+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{index}}-1].clientHeight;" stepKey="containerHeight"/>
51+
<executeJS function="return {$containerHeight}-{{storefrontBugOffset}}" stepKey="minusBugOffset"/>
52+
<assertEquals stepKey="assertContainerHeightEqualsMinHeight">
53+
<expectedResult type="string">{{minHeight}}</expectedResult>
54+
<actualResult type="variable">minusBugOffset</actualResult>
5155
</assertEquals>
52-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[0].getBoundingClientRect().bottom - 10" stepKey="rowBottomPositionMinusPadding"/>
53-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[0].getBoundingClientRect().bottom" stepKey="contentBottomPosition"/>
54-
<executeJS function="return Math.round(({$rowBottomPositionMinusPadding}/{$contentBottomPosition})*100)/100" stepKey="bottomPositionRatio"/>
56+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{index}}-1].getBoundingClientRect().bottom-{{padding.paddingBottom}}" stepKey="containerBottomPositionMinusPadding"/>
57+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{index}}-1].getBoundingClientRect().bottom" stepKey="contentBottomPosition"/>
58+
<executeJS function="return Math.round(({$containerBottomPositionMinusPadding}/{$contentBottomPosition})*100)/100" stepKey="bottomPositionRatio"/>
5559
<assertEquals stepKey="assertBottomPositionRatio">
5660
<expectedResult type="int">1</expectedResult>
5761
<actualResult type="variable">bottomPositionRatio</actualResult>

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,14 +1166,24 @@
11661166
<comment userInput="Verify min height and vertical alignment on stage before save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageBeforeSave"/>
11671167
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowMinHeightBeforeSave"/>
11681168
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyBottom.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowVerticalAlignmentBottomBeforeSave"/>
1169-
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentBeforeSave"/>
1169+
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentBeforeSave">
1170+
<argument name="container" value="RowOnStorefront"/>
1171+
<argument name="content" value="HtmlOnStorefront"/>
1172+
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1173+
<argument name="minHeight" value="PageBuilderMinHeightProperty_500.value"/>
1174+
</actionGroup>
11701175
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
11711176
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
11721177
<!-- Verify Vertical Alignment On Stage - After Save -->
11731178
<comment userInput="Verify min height and vertical alignment on stage after save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageAfterSave"/>
11741179
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowMinHeightAfterSave"/>
11751180
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyBottom.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowVerticalAlignmentBottomAfterSave"/>
1176-
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentAfterSave"/>
1181+
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentAfterSave">
1182+
<argument name="container" value="RowOnStorefront"/>
1183+
<argument name="content" value="HtmlOnStorefront"/>
1184+
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1185+
<argument name="minHeight" value="PageBuilderMinHeightProperty_500.value"/>
1186+
</actionGroup>
11771187
<!-- Verify Min Height and Vertical Alignment In Storefront -->
11781188
<comment userInput="Verify min height and vertical alignment in storefront" stepKey="commentVerifyMinHeightAndVerticalAlignmentInStorefront"/>
11791189
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -1182,7 +1192,11 @@
11821192
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowMinHeightStorefront"/>
11831193
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyBottom.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowVerticalAlignmentBottomStorefront"/>
11841194
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentStorefront">
1195+
<argument name="container" value="RowOnStorefront"/>
1196+
<argument name="content" value="HtmlOnStorefront"/>
11851197
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1198+
<argument name="minHeight" value="PageBuilderMinHeightProperty_500.value"/>
1199+
<argument name="storefrontBugOffset" value="20"/>
11861200
</actionGroup>
11871201
</test>
11881202
</tests>

0 commit comments

Comments
 (0)