Skip to content

Commit e46ee9f

Browse files
committed
Merge branch '559_no-predefined-gutters-slider' of github:bluemwhitew/magento2-page-builder into 559_no-predefined-gutters--baner
2 parents a0c9d5f + 87bf366 commit e46ee9f

File tree

18 files changed

+76
-44
lines changed

18 files changed

+76
-44
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
2929
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSBlockStage">
3030
<argument name="page" value="SlideOnBackend"/>
31+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3132
</actionGroup>
3233
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
3334
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
@@ -39,17 +40,20 @@
3940
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStage"/>
4041
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStage">
4142
<argument name="page" value="SlideOnFrontend"/>
43+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4244
</actionGroup>
4345
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
4446
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
4547
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefront">
4648
<argument name="page" value="SlideOnFrontend"/>
49+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4750
</actionGroup>
4851
<moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
4952
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
50-
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
53+
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingPropertyDefault.paddingLeft}} - {{PageBuilderPaddingPropertyDefault.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
5154
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
5255
<argument name="page" value="SlideOnFrontend"/>
56+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
5357
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageStorefrontMobile}"/>
5458
</actionGroup>
5559
</test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
2929
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionCMSBlockStage">
3030
<argument name="page" value="SlideOnBackend"/>
31+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3132
</actionGroup>
3233
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
3334
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
@@ -39,17 +40,20 @@
3940
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceCMSPageStage"/>
4041
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionCMSPageStage">
4142
<argument name="page" value="SlideOnFrontend"/>
43+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4244
</actionGroup>
4345
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
4446
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
4547
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionCMSPageStorefront">
4648
<argument name="page" value="SlideOnFrontend"/>
49+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4750
</actionGroup>
4851
<moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
4952
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
50-
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
53+
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingPropertyDefault.paddingLeft}} - {{PageBuilderPaddingPropertyDefault.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
5154
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
5255
<argument name="page" value="SlideOnFrontend"/>
56+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
5357
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageStorefrontMobile}"/>
5458
</actionGroup>
5559
</test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
2929
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionCMSBlockStage">
3030
<argument name="page" value="SlideOnBackend"/>
31+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3132
</actionGroup>
3233
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
3334
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
@@ -39,17 +40,20 @@
3940
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="seeAppearanceCMSPageStage"/>
4041
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionCMSPageStage">
4142
<argument name="page" value="SlideOnFrontend"/>
43+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4244
</actionGroup>
4345
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
4446
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
4547
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionCMSPageStorefront">
4648
<argument name="page" value="SlideOnFrontend"/>
49+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4750
</actionGroup>
4851
<moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
4952
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
50-
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
53+
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingPropertyDefault.paddingLeft}} - {{PageBuilderPaddingPropertyDefault.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
5154
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
5255
<argument name="page" value="SlideOnFrontend"/>
56+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
5357
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageStorefrontMobile}"/>
5458
</actionGroup>
5559
</test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</actionGroup>
166166
<executeJS function="return {{SlideOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSBlockStage"/>
167167
<executeJS function="return document.evaluate(&quot;{{SlideOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSBlockStage"/>
168-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
168+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
169169
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSBlockStage">
170170
<expectedResult type="int">5</expectedResult>
171171
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSBlockStage</actualResult>
@@ -230,7 +230,7 @@
230230
</actionGroup>
231231
<executeJS function="return {{SlideOnFrontend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSPageStage"/>
232232
<executeJS function="return document.evaluate(&quot;{{SlideOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSPageStage"/>
233-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
233+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
234234
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSPageStage">
235235
<expectedResult type="int">5</expectedResult>
236236
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSPageStage</actualResult>
@@ -292,7 +292,7 @@
292292
</actionGroup>
293293
<executeJS function="return {{SlideOnFrontend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSPageStorefront"/>
294294
<executeJS function="return document.evaluate(&quot;{{SlideOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSPageStorefront"/>
295-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
295+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
296296
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSPageStorefront">
297297
<expectedResult type="int">5</expectedResult>
298298
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSPageStorefront</actualResult>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenterOverlayPositionTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@
3333
</actionGroup>
3434
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionStage">
3535
<argument name="page" value="SlideOnBackend"/>
36+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3637
</actionGroup>
3738
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionStageAfterSave">
3839
<argument name="page" value="SlideOnBackend"/>
40+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3941
</actionGroup>
4042
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionStorefront">
4143
<argument name="page" value="SlideOnFrontend"/>
44+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4245
</actionGroup>
4346
</test>
4447
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayPositionTest.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@
6161
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
6262
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionStage">
6363
<argument name="page" value="SlideOnBackend"/>
64+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
6465
</actionGroup>
6566
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStage">
6667
<argument name="page" value="SlideOnBackend"/>
68+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
6769
</actionGroup>
6870
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStage">
6971
<argument name="page" value="SlideOnBackend"/>
72+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
7073
</actionGroup>
7174
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7275
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
@@ -75,12 +78,15 @@
7578
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
7679
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionStageAfterSave">
7780
<argument name="page" value="SlideOnBackend"/>
81+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
7882
</actionGroup>
7983
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStageAfterSave">
8084
<argument name="page" value="SlideOnBackend"/>
85+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
8186
</actionGroup>
8287
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStageAfterSave">
8388
<argument name="page" value="SlideOnBackend"/>
89+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
8490
</actionGroup>
8591
<!-- Validate Storefront -->
8692
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
@@ -89,12 +95,15 @@
8995
</actionGroup>
9096
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionStorefront">
9197
<argument name="page" value="SlideOnFrontend"/>
98+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
9299
</actionGroup>
93100
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStorefront">
94101
<argument name="page" value="SlideOnFrontend"/>
102+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
95103
</actionGroup>
96104
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStorefront">
97105
<argument name="page" value="SlideOnFrontend"/>
106+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
98107
</actionGroup>
99108
</test>
100109
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayPositionTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@
3333
</actionGroup>
3434
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionStage">
3535
<argument name="page" value="SlideOnBackend"/>
36+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3637
</actionGroup>
3738
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionStageAfterSave">
3839
<argument name="page" value="SlideOnBackend"/>
40+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
3941
</actionGroup>
4042
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionStorefront">
4143
<argument name="page" value="SlideOnFrontend"/>
44+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
4245
</actionGroup>
4346
</test>
4447
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
4949
<argument name="property" value="PageBuilderAppearance_Poster"/>
5050
</actionGroup>
51+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
52+
<argument name="property" value="PageBuilderPaddingProperty40"/>
53+
</actionGroup>
5154
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
5255
<!-- Inline Edit Slide Content -->
5356
<comment userInput="Inline Edit Slide Content" stepKey="commentInlineEdit"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth">
8888
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
8989
</actionGroup>
90+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
91+
<argument name="property" value="PageBuilderPaddingProperty40"/>
92+
</actionGroup>
9093
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
9194
<!-- Validate Stage -->
9295
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>

0 commit comments

Comments
 (0)