Skip to content

Commit eb63712

Browse files
cspruiellcspruiell
committed
MC-5372: Collage Center/Left/Right doesn't work correct in a container smaller than 100% width
 - fix broken overlay position tests
1 parent da486ac commit eb63712

File tree

4 files changed

+44
-31
lines changed

4 files changed

+44
-31
lines changed

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

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
</arguments>
6363
<!-- Validate right edge of overlay -->
6464
<comment userInput="Validate right edge of overlay" stepKey="commentValidateRightEdgeOfOverlay"/>
65-
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().right-{{page.wrapperJS(index)}}.getBoundingClientRect().width/2" stepKey="wrapperRightPositionMinusWidth50Percent"/>
65+
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().right" stepKey="wrapperRightPosition"/>
6666
<executeJS function="return {{page.overlayJS(index)}}.getBoundingClientRect().right" stepKey="overlayRightPosition"/>
67-
<executeJS function="return Math.round(({$wrapperRightPositionMinusWidth50Percent}/{$overlayRightPosition})*100)/100" stepKey="overlayRightRatio"/>
68-
<assertEquals stepKey="assertOverlayRightRatio">
69-
<expectedResult type="int">1</expectedResult>
70-
<actualResult type="variable">overlayRightRatio</actualResult>
71-
</assertEquals>
67+
<executeJS function="return Math.round(({$wrapperRightPosition}-{$overlayRightPosition})*100)/100" stepKey="overlaySpaceRight"/>
68+
<assertGreaterThanOrEqual stepKey="assertOverlaySpaceRightGreaterThanOrEqualToRightPadding">
69+
<expectedResult type="int">{{padding.paddingRight}}</expectedResult>
70+
<actualResult type="variable">overlaySpaceRight</actualResult>
71+
</assertGreaterThanOrEqual>
7272
<!-- Validate left edge of overlay -->
7373
<comment userInput="Validate left edge of overlay" stepKey="commentValidateLeftEdgeOfOverlay"/>
7474
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().left" stepKey="wrapperLeftPosition"/>
@@ -97,13 +97,13 @@
9797
</assertEquals>
9898
<!-- Validate left edge of overlay -->
9999
<comment userInput="Validate left edge of overlay" stepKey="commentValidateLeftEdgeOfOverlay"/>
100-
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().right-{{page.wrapperJS(index)}}.getBoundingClientRect().width/2" stepKey="wrapperRightMinusWidthHalf"/>
100+
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().left" stepKey="wrapperLeftPosition"/>
101101
<executeJS function="return {{page.overlayJS(index)}}.getBoundingClientRect().left" stepKey="overlayLeftPosition"/>
102-
<executeJS function="return Math.round(({$wrapperRightMinusWidthHalf}/{$overlayLeftPosition})*100)/100" stepKey="overlayLeftRatio"/>
103-
<assertEquals stepKey="assertOverlayLeftRatio">
104-
<expectedResult type="int">1</expectedResult>
105-
<actualResult type="variable">overlayLeftRatio</actualResult>
106-
</assertEquals>
102+
<executeJS function="return Math.round(({$overlayLeftPosition}-{$wrapperLeftPosition})*100)/100" stepKey="overlaySpaceLeft"/>
103+
<assertGreaterThanOrEqual stepKey="assertOverlaySpaceLeftGreaterThanOrEqualToLeftPadding">
104+
<expectedResult type="int">{{padding.paddingLeft}}</expectedResult>
105+
<actualResult type="variable">overlaySpaceLeft</actualResult>
106+
</assertGreaterThanOrEqual>
107107
</actionGroup>
108108
<!-- Checks the position of the overlay with small padding value. This action group may not work with large padding values -->
109109
<actionGroup name="validateOverlayPositionCollageCenter">
@@ -113,21 +113,22 @@
113113
<argument name="padding" defaultValue="PageBuilderPaddingProperty40"/>
114114
</arguments>
115115
<!-- Validate right edge of overlay -->
116-
<executeJS function="return ({{page.wrapperJS(index)}}.getBoundingClientRect().width+{{padding.paddingLeft}}+{{padding.paddingRight}})*.25" stepKey="wrapperWidthMinusPadding25"/>
117-
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().right-{{page.overlayJS(index)}}.getBoundingClientRect().right" stepKey="overlayRightPosition"/>
118-
<executeJS function="return Math.round(({$wrapperWidthMinusPadding25}/{$overlayRightPosition})*100)/100" stepKey="overlayRightRatio"/>
119-
<assertEquals stepKey="assertOverlayRightRatio">
120-
<expectedResult type="int">1</expectedResult>
121-
<actualResult type="variable">overlayRightRatio</actualResult>
122-
</assertEquals>
116+
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().right" stepKey="wrapperRightPosition"/>
117+
<executeJS function="return {{page.overlayJS(index)}}.getBoundingClientRect().right" stepKey="overlayRightPosition"/>
118+
<executeJS function="return Math.round(({$wrapperRightPosition}-{$overlayRightPosition})*100)/100" stepKey="overlaySpaceRight"/>
119+
<assertGreaterThanOrEqual stepKey="assertOverlaySpaceRightGreaterThanOrEqualToRightPadding">
120+
<expectedResult type="int">{{padding.paddingRight}}</expectedResult>
121+
<actualResult type="variable">overlaySpaceRight</actualResult>
122+
</assertGreaterThanOrEqual>
123123
<!-- Validate left edge of overlay -->
124124
<comment userInput="Validate left edge of overlay" stepKey="commentValidateLeftEdgeOfOverlay"/>
125-
<executeJS function="return {{page.overlayJS(index)}}.getBoundingClientRect().left-{{page.wrapperJS(index)}}.getBoundingClientRect().left" stepKey="overlayLeftPosition"/>
126-
<executeJS function="return Math.round(({$wrapperWidthMinusPadding25}/{$overlayLeftPosition})*100)/100" stepKey="overlayLeftRatio"/>
127-
<assertEquals stepKey="assertOverlayLeftRatio">
128-
<expectedResult type="int">1</expectedResult>
129-
<actualResult type="variable">overlayLeftRatio</actualResult>
130-
</assertEquals>
125+
<executeJS function="return {{page.wrapperJS(index)}}.getBoundingClientRect().left" stepKey="wrapperLeftPosition"/>
126+
<executeJS function="return {{page.overlayJS(index)}}.getBoundingClientRect().left" stepKey="overlayLeftPosition"/>
127+
<executeJS function="return Math.round(({$overlayLeftPosition}-{$wrapperLeftPosition})*100)/100" stepKey="overlaySpaceLeft"/>
128+
<assertGreaterThanOrEqual stepKey="assertOverlaySpaceLeftGreaterThanOrEqualToLeftPadding">
129+
<expectedResult type="int">{{padding.paddingLeft}}</expectedResult>
130+
<actualResult type="variable">overlaySpaceLeft</actualResult>
131+
</assertGreaterThanOrEqual>
131132
</actionGroup>
132133
<!-- Overlay Position -->
133134
<actionGroup name="validateOverlayPositionTop">

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,18 @@
323323
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
324324
</actionGroup>
325325
<comment userInput="keyForRemoval" stepKey="duplicateColumn"/>
326+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
327+
<argument name="page" value="BannerOnBackend"/>
328+
<argument name="height" value="50"/>
329+
</actionGroup>
330+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
331+
<argument name="page" value="BannerOnBackend"/>
332+
<argument name="height" value="50"/>
333+
</actionGroup>
334+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
335+
<argument name="page" value="BannerOnFrontend"/>
336+
<argument name="height" value="50"/>
337+
</actionGroup>
326338
</test>
327339
<test name="BannerCollageLeftButtonNeverShow">
328340
<annotations>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,11 +1444,11 @@
14441444
</actionGroup>
14451445
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
14461446
<argument name="page" value="BannerOnFrontend"/>
1447-
<argument name="height" value="120"/>
1447+
<argument name="height" value="50"/>
14481448
</actionGroup>
14491449
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
14501450
<argument name="page" value="BannerOnFrontend"/>
1451-
<argument name="height" value="120"/>
1451+
<argument name="height" value="50"/>
14521452
</actionGroup>
14531453
</test>
14541454
<test name="BlockSlidePosterContentCanWordWrap" extends="BlockBannerPosterContentCanWordWrap">
@@ -1531,11 +1531,11 @@
15311531
</actionGroup>
15321532
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
15331533
<argument name="page" value="SlideOnFrontend"/>
1534-
<argument name="height" value="120"/>
1534+
<argument name="height" value="50"/>
15351535
</actionGroup>
15361536
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
15371537
<argument name="page" value="SlideOnFrontend"/>
1538-
<argument name="height" value="120"/>
1538+
<argument name="height" value="50"/>
15391539
</actionGroup>
15401540
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
15411541
<argument name="page" value="SlideOnFrontend"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@
155155
</actionGroup>
156156
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
157157
<argument name="page" value="SlideOnBackend"/>
158-
<argument name="height" value="110"/>
158+
<argument name="height" value="50"/>
159159
</actionGroup>
160160
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
161161
<argument name="page" value="SlideOnBackend"/>
162-
<argument name="height" value="80"/>
162+
<argument name="height" value="50"/>
163163
</actionGroup>
164164
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
165165
<argument name="contentType" value="PageBuilderSliderContentType"/>

0 commit comments

Comments
 (0)