Skip to content

Commit 4c47ee4

Browse files
author
hannahnida
committed
#558: Developer can style content types output differently per viewport - Added fixes for Banner Column Content Type
1 parent c5327f6 commit 4c47ee4

File tree

32 files changed

+212
-219
lines changed

32 files changed

+212
-219
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml

Lines changed: 22 additions & 26 deletions
Large diffs are not rendered by default.

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml

Lines changed: 27 additions & 30 deletions
Large diffs are not rendered by default.

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMinHeightValidInputs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
2525
</actionGroup>
2626
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeFirstMinHeightStage">
27-
<argument name="selector" value="{{BannerOnBackend.collage('1')}}"/>
27+
<argument name="selector" value="{{BannerOnBackend.wrapper('1')}}"/>
2828
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
2929
<argument name="cssProperty" value="minHeight"/>
3030
</actionGroup>
3131
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('1')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStage"/>
3232
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightStage"/>
3333
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('3')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightStage"/>
3434
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeFirstMinHeightStorefront">
35-
<argument name="selector" value="{{BannerOnFrontend.collage('1')}}"/>
35+
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
3636
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
3737
<argument name="cssProperty" value="minHeight"/>
3838
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<argument name="cssProperty" value="backgroundColor"/>
6464
</actionGroup>
6565
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayStage">
66-
<argument name="selector" value="{{BannerOnBackend.contentPath('1')}}"/>
66+
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
6767
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
6868
<argument name="cssProperty" value="backgroundColor"/>
6969
</actionGroup>
7070
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverBannerStage"/>
7171
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayOnHoverStage">
72-
<argument name="selector" value="{{BannerOnBackend.contentPath('1')}}"/>
72+
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
7373
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
7474
<argument name="cssProperty" value="backgroundColor"/>
7575
</actionGroup>
@@ -87,13 +87,13 @@
8787
<argument name="cssProperty" value="backgroundColor"/>
8888
</actionGroup>
8989
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayStorefront">
90-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
90+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
9191
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
9292
<argument name="cssProperty" value="backgroundColor"/>
9393
</actionGroup>
9494
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
9595
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayOnHoverStorefront">
96-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
96+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
9797
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
9898
<argument name="cssProperty" value="backgroundColor"/>
9999
</actionGroup>
@@ -108,13 +108,13 @@
108108
<argument name="cssProperty" value="backgroundColor"/>
109109
</actionGroup>
110110
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayStorefrontMobile">
111-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
111+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
112112
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
113113
<argument name="cssProperty" value="backgroundColor"/>
114114
</actionGroup>
115115
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
116116
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeTransparentOverlayOnHoverStorefrontMobile">
117-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
117+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
118118
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
119119
<argument name="cssProperty" value="backgroundColor"/>
120120
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAdvancedConfigurationValuesTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</actionGroup>
105105
<seeElement selector="{{BannerOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage"/>
106106
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStage">
107-
<argument name="selector" value="{{BannerOnBackend.bannerPath('1')}}"/>
107+
<argument name="selector" value="{{BannerOnBackend.base('1')}}"/>
108108
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
109109
<argument name="cssProperty" value="margin"/>
110110
</actionGroup>
@@ -176,7 +176,7 @@
176176
</actionGroup>
177177
<seeElement selector="{{BannerOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage2"/>
178178
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStage2">
179-
<argument name="selector" value="{{BannerOnBackend.bannerPath('1')}}"/>
179+
<argument name="selector" value="{{BannerOnBackend.base('1')}}"/>
180180
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
181181
<argument name="cssProperty" value="margin"/>
182182
</actionGroup>
@@ -247,7 +247,7 @@
247247
</actionGroup>
248248
<seeElement selector="{{BannerOnFrontend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStorefront"/>
249249
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStorefront">
250-
<argument name="selector" value="{{BannerOnFrontend.bannerPath('1')}}"/>
250+
<argument name="selector" value="{{BannerOnFrontend.base('1')}}"/>
251251
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
252252
<argument name="cssProperty" value="margin"/>
253253
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
138138
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage"/>
139139
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMinimumHeightStage">
140-
<argument name="selector" value="{{BannerOnBackend.collage('1')}}"/>
140+
<argument name="selector" value="{{BannerOnBackend.wrapper('1')}}"/>
141141
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
142142
<argument name="cssProperty" value="minHeight"/>
143143
</actionGroup>
@@ -159,7 +159,7 @@
159159
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage"/>
160160
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage"/>
161161
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeOverlayBackgroundColor">
162-
<argument name="selector" value="{{BannerOnBackend.contentPath('1')}}"/>
162+
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
163163
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
164164
<argument name="cssProperty" value="backgroundColor"/>
165165
</actionGroup>
@@ -190,7 +190,7 @@
190190
</actionGroup>
191191
<seeElement selector="{{BannerOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage"/>
192192
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStage">
193-
<argument name="selector" value="{{BannerOnBackend.bannerPath('1')}}"/>
193+
<argument name="selector" value="{{BannerOnBackend.base('1')}}"/>
194194
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
195195
<argument name="cssProperty" value="margin"/>
196196
</actionGroup>
@@ -206,7 +206,7 @@
206206
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
207207
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage2"/>
208208
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMinimumHeightStage2">
209-
<argument name="selector" value="{{BannerOnBackend.collage('1')}}"/>
209+
<argument name="selector" value="{{BannerOnBackend.wrapper('1')}}"/>
210210
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
211211
<argument name="cssProperty" value="minHeight"/>
212212
</actionGroup>
@@ -228,7 +228,7 @@
228228
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage2"/>
229229
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage2"/>
230230
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeOverlayBackgroundColor2">
231-
<argument name="selector" value="{{BannerOnBackend.contentPath('1')}}"/>
231+
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
232232
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
233233
<argument name="cssProperty" value="backgroundColor"/>
234234
</actionGroup>
@@ -259,7 +259,7 @@
259259
</actionGroup>
260260
<seeElement selector="{{BannerOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage2"/>
261261
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStage2">
262-
<argument name="selector" value="{{BannerOnBackend.bannerPath('1')}}"/>
262+
<argument name="selector" value="{{BannerOnBackend.base('1')}}"/>
263263
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
264264
<argument name="cssProperty" value="margin"/>
265265
</actionGroup>
@@ -355,7 +355,7 @@
355355
</actionGroup>
356356
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStorefront"/>
357357
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMinimumHeightStorefront">
358-
<argument name="selector" value="{{BannerOnFrontend.collage('1')}}"/>
358+
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
359359
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
360360
<argument name="cssProperty" value="minHeight"/>
361361
</actionGroup>
@@ -378,7 +378,7 @@
378378
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
379379
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStorefront"/>
380380
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeOverlayBackgroundStorefront">
381-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
381+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
382382
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
383383
<argument name="cssProperty" value="backgroundColor"/>
384384
</actionGroup>
@@ -409,7 +409,7 @@
409409
</actionGroup>
410410
<seeElement selector="{{BannerOnFrontend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStorefront"/>
411411
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMarginsStorefront">
412-
<argument name="selector" value="{{BannerOnFrontend.bannerPath('1')}}"/>
412+
<argument name="selector" value="{{BannerOnFrontend.base('1')}}"/>
413413
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
414414
<argument name="cssProperty" value="margin"/>
415415
</actionGroup>
@@ -423,7 +423,7 @@
423423
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
424424
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeMobileAppearanceStorefront"/>
425425
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMobileMinimumHeightStorefront">
426-
<argument name="selector" value="{{BannerOnFrontend.collage('1')}}"/>
426+
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
427427
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
428428
<argument name="cssProperty" value="minHeight"/>
429429
</actionGroup>
@@ -440,7 +440,7 @@
440440
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeMobileButtonTextStorefront"/>
441441
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeMobileOverlayStateStorefront"/>
442442
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMobileOverlayBackgroundStorefront">
443-
<argument name="selector" value="{{BannerOnFrontend.contentPath('1')}}"/>
443+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
444444
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
445445
<argument name="cssProperty" value="backgroundColor"/>
446446
</actionGroup>
@@ -471,7 +471,7 @@
471471
</actionGroup>
472472
<seeElement selector="{{BannerOnFrontend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeMobileCSSClassesStorefront"/>
473473
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeMobileMarginsStorefront">
474-
<argument name="selector" value="{{BannerOnFrontend.bannerPath('1')}}"/>
474+
<argument name="selector" value="{{BannerOnFrontend.base('1')}}"/>
475475
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
476476
<argument name="cssProperty" value="margin"/>
477477
</actionGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
2525
</actionGroup>
2626
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeFirstMinHeightStage">
27-
<argument name="selector" value="{{BannerOnBackend.collage('1')}}"/>
27+
<argument name="selector" value="{{BannerOnBackend.wrapper('1')}}"/>
2828
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
2929
<argument name="cssProperty" value="minHeight"/>
3030
</actionGroup>
3131
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('1')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStage"/>
3232
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightStage"/>
3333
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.wrapper('3')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightStage"/>
3434
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeFirstMinHeightStorefront">
35-
<argument name="selector" value="{{BannerOnFrontend.collage('1')}}"/>
35+
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
3636
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
3737
<argument name="cssProperty" value="minHeight"/>
3838
</actionGroup>

0 commit comments

Comments
 (0)