Skip to content

Commit 6bd9471

Browse files
author
hannahnida
committed
#558: Developer can style content types output differently per viewport - Slider min-height fixes
1 parent 18e9038 commit 6bd9471

File tree

11 files changed

+26
-24
lines changed

11 files changed

+26
-24
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</annotations>
1414
<arguments>
1515
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
16-
<argument name="border" defaultValue=""/>
16+
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1717
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1818
</arguments>
1919
<assertEquals stepKey="assertAlignment">

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="TabOnStage">
11-
<element name="base" type="button" selector="(//div[@data-content-type='tab-item'])[{{arg1}}]" parameterized="true"/>
11+
<element name="base" type="button" selector="(//div[@data-content-type=&quot;tab-item&quot;])[{{arg1}}]" parameterized="true"/>
1212
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
1313
<element name="elementChildren" type="text" selector="(//*[@role=&quot;tabpanel&quot;])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-tab-item&quot;)]//div[contains(@class, &quot;tab-item-container&quot;)]" parameterized="true"/>
1414
<element name="all" type="button" selector=".pagebuilder-tab-item"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder1Test.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
<comment userInput="Stage: Check Border: Default" stepKey="commentStageCheckDefault"/>
143143
<actionGroup ref="ValidateAdvancedConfigurationWithNoBorderActionGroup" stepKey="validateStageDefault">
144144
<argument name="page" value="TextOnStage"/>
145+
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
145146
<argument name="index" value="2"/>
146147
</actionGroup>
147148
<!-- Stage: Check Border: Dotted -->
@@ -182,6 +183,7 @@
182183
<comment userInput="Stage: Check Border: Default" stepKey="commentStageCheckDefault2"/>
183184
<actionGroup ref="ValidateAdvancedConfigurationWithNoBorderActionGroup" stepKey="validateStageDefault2">
184185
<argument name="page" value="TextOnStage"/>
186+
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
185187
<argument name="index" value="2"/>
186188
</actionGroup>
187189
<!-- Stage: Check Border: Dotted -->
@@ -224,6 +226,7 @@
224226
<actionGroup ref="ValidateAdvancedConfigurationWithNoBorderActionGroup" stepKey="validateStorefrontDefault2">
225227
<argument name="page" value="TextOnStorefront"/>
226228
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
229+
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
227230
<argument name="index" value="2"/>
228231
</actionGroup>
229232
<!-- Storefront: Check Border: Dotted -->

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@
307307
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_External.value)}}" stepKey="clickLinkUrlCMSPageStorefront"/>
308308
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefront"/>
309309
<seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlCMSPageStorefront"/>
310-
<moveMouseOver selector="{{SlideOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromSlide"/>
311310
<!-- Validate CMS Page Storefront Mobile -->
312311
<comment userInput="Validate CMS Page Storefront Mobile" stepKey="commentValidateCMSPageStorefrontMobile"/>
313312
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<!-- Validate CMS Block Stage -->
142142
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSBlockStage"/>
143143
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstSliderMinHeightCMSBlockStage">
144-
<argument name="selector" value="{{SliderOnStage.base('1')}}"/>
144+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('1')}}"/>
145145
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
146146
<argument name="cssProperty" value="minHeight"/>
147147
</actionGroup>
@@ -189,7 +189,7 @@
189189
<expectedResult type="variable">viewportHeightCMSBlockStage</expectedResult>
190190
</assertEquals>
191191
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFourthSliderMinHeightCMSBlockStage">
192-
<argument name="selector" value="{{SliderOnStage.base('4')}}"/>
192+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('4')}}"/>
193193
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
194194
<argument name="cssProperty" value="minHeight"/>
195195
</actionGroup>
@@ -228,7 +228,7 @@
228228
<!-- Validate CMS Page Stage -->
229229
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSPageStage"/>
230230
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstSliderMinHeightCMSPageStage">
231-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
231+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
232232
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
233233
<argument name="cssProperty" value="minHeight"/>
234234
</actionGroup>
@@ -300,7 +300,7 @@
300300
</actionGroup>
301301
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
302302
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstSliderMinHeightStorefront">
303-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
303+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
304304
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
305305
<argument name="cssProperty" value="minHeight"/>
306306
</actionGroup>
@@ -348,7 +348,7 @@
348348
<expectedResult type="variable">viewportHeightStorefront</expectedResult>
349349
</assertEquals>
350350
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFourthSliderMinHeightStorefront">
351-
<argument name="selector" value="{{SliderOnFrontend.base('4')}}"/>
351+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('4')}}"/>
352352
<argument name="expectedProperty" value="auto"/>
353353
<argument name="cssProperty" value="minHeight"/>
354354
</actionGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<seeElement selector="{{SliderOnStage.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSBlockStage"/>
114114
<seeElement selector="{{SliderOnStage.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSBlockStage"/>
115115
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinHeightCMSBlockStage">
116-
<argument name="selector" value="{{SliderOnStage.base('1')}}"/>
116+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('1')}}"/>
117117
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
118118
<argument name="cssProperty" value="minHeight"/>
119119
</actionGroup>
@@ -173,7 +173,7 @@
173173
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStage"/>
174174
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStage"/>
175175
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeHeightCMSPageStage">
176-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
176+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
177177
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
178178
<argument name="cssProperty" value="minHeight"/>
179179
</actionGroup>
@@ -196,7 +196,7 @@
196196
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStorefront"/>
197197
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStorefront"/>
198198
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeHeightCMSPageStorefront">
199-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
199+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
200200
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
201201
<argument name="cssProperty" value="minHeight"/>
202202
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayAndButtonOnHoverTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<dontSeeElement selector="{{SlideOnBackend.button('1')}}" stepKey="dontSeeButtonStage"/>
7777
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayStage">
7878
<argument name="selector" value="{{SlideOnBackend.overlay('1')}}"/>
79-
<argument name="expectedProperty" value="{{PageBuilderStageBackgroundColor_Default.rgba}}"/>
79+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Default.rgba}}"/>
8080
<argument name="cssProperty" value="backgroundColor"/>
8181
</actionGroup>
8282
<moveMouseOver selector="{{SlideOnBackend.base('1')}}" stepKey="moveMouseOverSlideStage"/>
@@ -104,7 +104,7 @@
104104
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
105105
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayStorefront">
106106
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
107-
<argument name="expectedProperty" value="{{PageBuilderStageBackgroundColor_Default.rgba}}"/>
107+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Default.rgba}}"/>
108108
<argument name="cssProperty" value="backgroundColor"/>
109109
</actionGroup>
110110
<moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefront"/>
@@ -137,7 +137,7 @@
137137
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
138138
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayStorefrontMobile">
139139
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
140-
<argument name="expectedProperty" value="{{PageBuilderStageBackgroundColor_Default.rgba}}"/>
140+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Default.rgba}}"/>
141141
<argument name="cssProperty" value="backgroundColor"/>
142142
</actionGroup>
143143
<moveMouseOver selector="{{SlideOnFrontend.base('1')}}" x="1" y="1" stepKey="moveMouseOverSlideStorefrontMobile"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAllAttributesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<seeElement selector="{{SliderOnStage.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsStage"/>
130130
<seeElement selector="{{SliderOnStage.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsStage"/>
131131
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinHeightStage">
132-
<argument name="selector" value="{{SliderOnStage.base('1')}}"/>
132+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('1')}}"/>
133133
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100px.intValue}}"/>
134134
<argument name="cssProperty" value="minHeight"/>
135135
</actionGroup>
@@ -192,7 +192,7 @@
192192
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsStorefront"/>
193193
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsStorefront"/>
194194
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeHeightStorefront">
195-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
195+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
196196
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100px.intValue}}"/>
197197
<argument name="cssProperty" value="minHeight"/>
198198
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<seeElement selector="{{SliderOnStage.showArrows('2', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsStage"/>
141141
<seeElement selector="{{SliderOnStage.showDots('2', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsStage"/>
142142
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinHeightStage">
143-
<argument name="selector" value="{{SliderOnStage.base('2')}}"/>
143+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('2')}}"/>
144144
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100px.intValue}}"/>
145145
<argument name="cssProperty" value="minHeight"/>
146146
</actionGroup>
@@ -215,7 +215,7 @@
215215
<seeElement selector="{{SliderOnStage.showArrows('2', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsStage2"/>
216216
<seeElement selector="{{SliderOnStage.showDots('2', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsStage2"/>
217217
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinHeightStage2">
218-
<argument name="selector" value="{{SliderOnStage.base('1')}}"/>
218+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('1')}}"/>
219219
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100px.intValue}}"/>
220220
<argument name="cssProperty" value="minHeight"/>
221221
</actionGroup>
@@ -342,7 +342,7 @@
342342
<seeElement selector="{{SliderOnFrontend.showArrows('2', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsStorefront"/>
343343
<seeElement selector="{{SliderOnFrontend.showDots('2', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsStorefront"/>
344344
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeHeightStorefront">
345-
<argument name="selector" value="{{SliderOnFrontend.base('2')}}"/>
345+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('2')}}"/>
346346
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100px.intValue}}"/>
347347
<argument name="cssProperty" value="minHeight"/>
348348
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMinHeightWithPosterSlideMinHeight.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<!-- Validate Stage -->
139139
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStage"/>
140140
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstSliderMinHeightStage">
141-
<argument name="selector" value="{{SliderOnStage.base('1')}}"/>
141+
<argument name="selector" value="{{SliderOnStage.advancedConfigurationPath('1')}}"/>
142142
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
143143
<argument name="cssProperty" value="minHeight"/>
144144
</actionGroup>
@@ -206,7 +206,7 @@
206206
</actionGroup>
207207
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
208208
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstSliderMinHeightStorefront">
209-
<argument name="selector" value="{{SliderOnFrontend.base('1')}}"/>
209+
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
210210
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
211211
<argument name="cssProperty" value="minHeight"/>
212212
</actionGroup>

0 commit comments

Comments
 (0)