Skip to content

Commit 3d03993

Browse files
committed
MC-4280: Row Vertical Alignment Doesn't Work Inside Block & Dynamic Block
- assert content position is aligned to the bottom
1 parent 26c3ff8 commit 3d03993

File tree

5 files changed

+29
-0
lines changed

5 files changed

+29
-0
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,25 @@
3636
<seeElement selector="{{BlockOnStage.title(index,block.title)}}" stepKey="seeOptionMenuTitle"/>
3737
<see selector="{{BlockOnStage.content(index)}}" userInput="{{block.content}}" stepKey="seeBlockContentOnStage"/>
3838
</actionGroup>
39+
<actionGroup name="verifyVerticalAlignmentBottomInBlock">
40+
<arguments>
41+
<argument name="block" defaultValue="BlockOnStorefront"/>
42+
<argument name="container" defaultValue="RowOnStorefront"/>
43+
<argument name="content" defaultValue="HtmlOnStorefront"/>
44+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
45+
</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>
51+
</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"/>
55+
<assertEquals stepKey="assertBottomPositionRatio">
56+
<expectedResult type="int">1</expectedResult>
57+
<actualResult type="variable">bottomPositionRatio</actualResult>
58+
</assertEquals>
59+
</actionGroup>
3960
</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<element name="ancestor" type="text" selector="[ancestor::div[@data-role='block']]"/>
4747
<element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
4848
<element name="base" type="text" selector="(//div[@data-role='block'])[{{arg1}}]" parameterized="true"/>
49+
<element name="baseCSS" type="text" selector="[data-role=block]"/>
4950
<element name="hidden" type="text" selector="(//div[@data-role='block'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
5051
<element name="notHidden" type="text" selector="(//div[@data-role='block'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
5152
<element name="hr" type="button" selector="(//div[@data-role='block'])[{{arg1}}]/hr" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
</section>
2929
<section name="HtmlOnStorefront">
3030
<element name="base" type="text" selector="(//div[@data-role='html'])[{{arg1}}]" parameterized="true"/>
31+
<element name="baseCSS" type="text" selector="[data-role=html]"/>
3132
<element name="hidden" type="text" selector="(//div[@data-role='html'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
3233
<element name="notHidden" type="text" selector="(//div[@data-role='html'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
3334
<element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]{{arg2}}" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
</section>
7474
<section name="RowOnStorefront">
7575
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div" parameterized="true"/>
76+
<element name="baseCSS" type="text" selector="[data-role=row]"/>
7677
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row] > div')[{{arg1}} - 1]" parameterized="true"/>
7778
<element name="hidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
7879
<element name="notHidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,18 +1166,23 @@
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"/>
11691170
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
11701171
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
11711172
<!-- Verify Vertical Alignment On Stage - After Save -->
11721173
<comment userInput="Verify min height and vertical alignment on stage after save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageAfterSave"/>
11731174
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowMinHeightAfterSave"/>
11741175
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyBottom.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowVerticalAlignmentBottomAfterSave"/>
1176+
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentAfterSave"/>
11751177
<!-- Verify Min Height and Vertical Alignment In Storefront -->
11761178
<comment userInput="Verify min height and vertical alignment in storefront" stepKey="commentVerifyMinHeightAndVerticalAlignmentInStorefront"/>
11771179
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
11781180
<argument name="contentType" value="PageBuilderBlockContentType"/>
11791181
</actionGroup>
11801182
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowMinHeightStorefront"/>
11811183
<seeElement selector="({{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyBottom.style)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeRowVerticalAlignmentBottomStorefront"/>
1184+
<actionGroup ref="verifyVerticalAlignmentBottomInBlock" stepKey="verifyBottomAlignmentStorefront">
1185+
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1186+
</actionGroup>
11821187
</test>
11831188
</tests>

0 commit comments

Comments
 (0)