Skip to content

Commit 33b93eb

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Banner changes and Mftf tests fixes
1 parent affd1f8 commit 33b93eb

File tree

9 files changed

+56
-48
lines changed

9 files changed

+56
-48
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayPositionTest.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="BannerOnBackend"/>
64+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
6465
</actionGroup>
6566
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStage">
6667
<argument name="page" value="BannerOnBackend"/>
68+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
6769
</actionGroup>
6870
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStage">
6971
<argument name="page" value="BannerOnBackend"/>
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="BannerOnBackend"/>
81+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
7882
</actionGroup>
7983
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStageAfterSave">
8084
<argument name="page" value="BannerOnBackend"/>
85+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
8186
</actionGroup>
8287
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStageAfterSave">
8388
<argument name="page" value="BannerOnBackend"/>
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="BannerOnFrontend"/>
98+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
9299
</actionGroup>
93100
<actionGroup ref="validateOverlayPositionTop" stepKey="validateOverlayPositionTopStorefront">
94101
<argument name="page" value="BannerOnFrontend"/>
102+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
95103
</actionGroup>
96104
<actionGroup ref="validateOverlayPositionBottom" stepKey="validateOverlayPositionBottomStorefront">
97105
<argument name="page" value="BannerOnFrontend"/>
106+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
98107
</actionGroup>
99108
</test>
100109
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyBannerPreviewValidationTest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<seeElement selector="{{BannerOnBackend.emptyBanner('1')}}" stepKey="seeEmptyBannerContent"/>
4747
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="waitForPoster">
4848
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
49-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
49+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyOverlayDefault.value}}"/>
5050
<argument name="cssProperty" value="padding"/>
5151
</actionGroup>
5252
<seeElement selector="{{BannerOnBackend.overlay('1')}}" stepKey="seeOverlay"/>
@@ -67,7 +67,7 @@
6767
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="seeBannerInFrontend1"/>
6868
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seePosterInFrontEnd">
6969
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
70-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
70+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyOverlayDefault.value}}"/>
7171
<argument name="cssProperty" value="padding"/>
7272
</actionGroup>
7373
<dontSee userInput="{{PageBuilderBannerMessageDefaultProperty.placeholder}}" stepKey="dontSeePosterMessageInFrontend"/>
@@ -96,7 +96,7 @@
9696
<seeElement selector="{{BannerOnBackend.emptyBanner('1')}}" stepKey="seeEmptyBannerContent2"/>
9797
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="waitForCollageLeft">
9898
<argument name="selector" value="{{BannerOnBackend.advancedConfigurationPath('1')}}"/>
99-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
99+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
100100
<argument name="cssProperty" value="padding"/>
101101
</actionGroup>
102102
<seeElement selector="{{BannerOnBackend.overlay('1')}}" stepKey="seeOverlay2"/>
@@ -114,7 +114,7 @@
114114
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="seeBannerInFrontend2"/>
115115
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeCollageLeftInFrontEnd">
116116
<argument name="selector" value="{{BannerOnFrontend.advancedConfigurationPath('1')}}"/>
117-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
117+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
118118
<argument name="cssProperty" value="padding"/>
119119
</actionGroup>
120120
<dontSee userInput="{{PageBuilderBannerMessageDefaultProperty.placeholder}}" stepKey="dontSeeCollageLeftMessageInFrontend"/>
@@ -143,7 +143,7 @@
143143
<seeElement selector="{{BannerOnBackend.emptyBanner('1')}}" stepKey="seeEmptyBannerContent3"/>
144144
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="waitForCollageCenter">
145145
<argument name="selector" value="{{BannerOnBackend.advancedConfigurationPath('1')}}"/>
146-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
146+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
147147
<argument name="cssProperty" value="padding"/>
148148
</actionGroup>
149149
<seeElement selector="{{BannerOnBackend.overlay('1')}}" stepKey="seeOverlay3"/>
@@ -161,7 +161,7 @@
161161
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="seeBannerInFrontend3"/>
162162
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeCollageCenterInFrontEnd">
163163
<argument name="selector" value="{{BannerOnFrontend.advancedConfigurationPath('1')}}"/>
164-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
164+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
165165
<argument name="cssProperty" value="padding"/>
166166
</actionGroup>
167167
<dontSee userInput="{{PageBuilderBannerMessageDefaultProperty.placeholder}}" stepKey="dontSeeCollageCenterMessageInFrontend"/>
@@ -190,7 +190,7 @@
190190
<seeElement selector="{{BannerOnBackend.emptyBanner('1')}}" stepKey="seeEmptyBannerContent4"/>
191191
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="waitForCollageRight">
192192
<argument name="selector" value="{{BannerOnBackend.advancedConfigurationPath('1')}}"/>
193-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
193+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
194194
<argument name="cssProperty" value="padding"/>
195195
</actionGroup>
196196
<seeElement selector="{{BannerOnBackend.overlay('1')}}" stepKey="seeOverlay4"/>
@@ -208,7 +208,7 @@
208208
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="seeBannerInFrontend4"/>
209209
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeCollageRightInFrontEnd">
210210
<argument name="selector" value="{{BannerOnFrontend.advancedConfigurationPath('1')}}"/>
211-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
211+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
212212
<argument name="cssProperty" value="padding"/>
213213
</actionGroup>
214214
<dontSee userInput="{{PageBuilderBannerMessageDefaultProperty.placeholder}}" stepKey="dontSeeCollageRightMessageInFrontend"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<argument name="property" value="PageBuilderAdvancedCssClassesDefaultProperty"/>
6262
</actionGroup>
6363
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
64-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
64+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
6565
</actionGroup>
6666
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
67-
<argument name="property" value="PageBuilderPaddingProperty40"/>
67+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
6868
</actionGroup>
6969
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
7070
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
@@ -104,7 +104,7 @@
104104
</actionGroup>
105105
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seePaddingStage">
106106
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
107-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
107+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyOverlayDefault.value}}"/>
108108
<argument name="cssProperty" value="padding"/>
109109
</actionGroup>
110110
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
@@ -146,7 +146,7 @@
146146
</actionGroup>
147147
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seePaddingStage2">
148148
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
149-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
149+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyOverlayDefault.value}}"/>
150150
<argument name="cssProperty" value="padding"/>
151151
</actionGroup>
152152
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -173,10 +173,10 @@
173173
<argument name="property" value="PageBuilderAdvancedCssClassesDefaultProperty"/>
174174
</actionGroup>
175175
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
176-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
176+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
177177
</actionGroup>
178178
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
179-
<argument name="property" value="PageBuilderPaddingProperty40"/>
179+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
180180
</actionGroup>
181181
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
182182
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -217,7 +217,7 @@
217217
</actionGroup>
218218
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeInDOMPaddingStorefront">
219219
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
220-
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
220+
<argument name="expectedProperty" value="{{PageBuilderPaddingPropertyOverlayDefault.value}}"/>
221221
<argument name="cssProperty" value="padding"/>
222222
</actionGroup>
223223
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAlignmentInheritanceTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<actionGroup ref="saveEditPanelSettings" stepKey="saveBannerEditPanelSettings"/>
6767
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPosition"/>
6868
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPosition"/>
69-
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPadding"/>
69+
<executeJS function="return Math.abs(Math.round({$buttonLeftPosition}-{$overlayLeftPosition}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPadding"/>
7070
<assertLessThanOrEqual stepKey="assertButtonLeftAligned">
7171
<expectedResult type="int">5</expectedResult>
7272
<actualResult type="variable">buttonMinusOverlayMinusPadding</actualResult>
@@ -92,7 +92,7 @@
9292
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
9393
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPosition"/>
9494
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPosition"/>
95-
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPadding"/>
95+
<executeJS function="return Math.abs(Math.round({$overlayRightPosition}-{$buttonRightPosition}-{{PageBuilderPaddingPropertyOverlayDefault.paddingRight}}))" stepKey="overlayMinusButtonMinusPadding"/>
9696
<assertLessThanOrEqual stepKey="assertButtonRightAligned">
9797
<expectedResult type="int">5</expectedResult>
9898
<actualResult type="variable">overlayMinusButtonMinusPadding</actualResult>
@@ -109,7 +109,7 @@
109109
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
110110
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPositionAfterSave"/>
111111
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPositionAfterSave"/>
112-
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
112+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionAfterSave}-{$buttonRightPositionAfterSave}-{{PageBuilderPaddingPropertyOverlayDefault.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingAfterSave"/>
113113
<assertLessThanOrEqual stepKey="assertButtonRightAlignedAfterSave">
114114
<expectedResult type="int">5</expectedResult>
115115
<actualResult type="variable">overlayMinusButtonMinusPaddingAfterSave</actualResult>
@@ -126,7 +126,7 @@
126126
</actionGroup>
127127
<executeJS function="return {{BannerOnFrontend.overlayJS('1')}}.getBoundingClientRect().right" stepKey="overlayRightPositionStoreFront"/>
128128
<executeJS function="return document.evaluate(&quot;{{BannerOnFrontend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().right" stepKey="buttonRightPositionStoreFront"/>
129-
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-{{PageBuilderPaddingProperty40.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
129+
<executeJS function="return Math.abs(Math.round({$overlayRightPositionStoreFront}-{$buttonRightPositionStoreFront}-{{PageBuilderPaddingPropertyOverlayDefault.paddingRight}}))" stepKey="overlayMinusButtonMinusPaddingStoreFront"/>
130130
<assertLessThanOrEqual stepKey="assertButtonRightAlignedStoreFront">
131131
<expectedResult type="int">5</expectedResult>
132132
<actualResult type="variable">overlayMinusButtonMinusPaddingStoreFront</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<argument name="cssProperty" value="minHeight"/>
3535
</actionGroup>
3636
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverBannerCMSBlockStage"/>
37-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
37+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
3838
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStage"/>
3939
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStage">
4040
<argument name="page" value="BannerOnFrontend"/>
@@ -44,7 +44,7 @@
4444
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
4545
<argument name="cssProperty" value="minHeight"/>
4646
</actionGroup>
47-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
47+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
4848
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
4949
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefront">
5050
<argument name="page" value="BannerOnFrontend"/>
@@ -55,8 +55,8 @@
5555
<argument name="cssProperty" value="minHeight"/>
5656
</actionGroup>
5757
<moveMouseOver selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverBannerCMSPageStorefront"/>
58-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
59-
<executeJS function="return Math.abs({{BannerOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
58+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-{{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
59+
<executeJS function="return Math.abs({{BannerOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width)" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
6060
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
6161
<argument name="page" value="BannerOnFrontend"/>
6262
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageStorefrontMobile}"/>

0 commit comments

Comments
 (0)