Skip to content

Commit 72c00f9

Browse files
committed
Merge branch '559_no-predefined-gutters' of bluemwhitew/magento2-page-builder into 559_no-predefined-gutters
2 parents 3141ef0 + 751953c commit 72c00f9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWithinTabTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@
109109
</actionGroup>
110110
<executeJS function="return document.querySelectorAll('{{TabOnStorefront.all}}')[0].offsetWidth" stepKey="tabWidthStorefrontMobile"/>
111111
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
112-
<assertLessThan stepKey="assertButtonSmallerThanTabStorefrontMobile">
112+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanTabStorefrontMobile">
113113
<expectedResult type="variable">$tabWidthStorefrontMobile</expectedResult>
114114
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
115-
</assertLessThan>
115+
</assertLessThanOrEqual>
116116
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
117117
</test>
118118
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</actionGroup>
167167
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSBlockStage"/>
168168
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSBlockStage"/>
169-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
169+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
170170
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSBlockStage">
171171
<expectedResult type="int">5</expectedResult>
172172
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSBlockStage</actualResult>
@@ -226,7 +226,7 @@
226226
</actionGroup>
227227
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSBlockStageDesktop"/>
228228
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSBlockStageDesktop"/>
229-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStageDesktop}-{$overlayLeftPositionCMSBlockStageDesktop}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStageDesktop"/>
229+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStageDesktop}-{$overlayLeftPositionCMSBlockStageDesktop}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStageDesktop"/>
230230
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSBlockStageDesktop">
231231
<expectedResult type="int">5</expectedResult>
232232
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSBlockStageDesktop</actualResult>
@@ -294,7 +294,7 @@
294294
</actionGroup>
295295
<executeJS function="return {{BannerOnFrontend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSPageStage"/>
296296
<executeJS function="return document.evaluate(&quot;{{BannerOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSPageStage"/>
297-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
297+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
298298
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSPageStage">
299299
<expectedResult type="int">5</expectedResult>
300300
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSPageStage</actualResult>
@@ -345,7 +345,7 @@
345345
</actionGroup>
346346
<executeJS function="return {{BannerOnFrontend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSPageStageDesktop"/>
347347
<executeJS function="return document.evaluate(&quot;{{BannerOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSPageStageDesktop"/>
348-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStageDesktop}-{$overlayLeftPositionCMSPageStageDesktop}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStageDesktop"/>
348+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStageDesktop}-{$overlayLeftPositionCMSPageStageDesktop}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStageDesktop"/>
349349
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSPageStageDesktop">
350350
<expectedResult type="int">5</expectedResult>
351351
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSPageStageDesktop</actualResult>
@@ -407,7 +407,7 @@
407407
</actionGroup>
408408
<executeJS function="return {{BannerOnFrontend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSPageStorefront"/>
409409
<executeJS function="return document.evaluate(&quot;{{BannerOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSPageStorefront"/>
410-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
410+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
411411
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSPageStorefront">
412412
<expectedResult type="int">5</expectedResult>
413413
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSPageStorefront</actualResult>

0 commit comments

Comments
 (0)