Skip to content

Commit ca53919

Browse files
omiroshnichenkoomiroshnichenko
committed
PB-379: Full height Slider/Slide
- fix failed tests
1 parent 6980a9c commit ca53919

10 files changed

+66
-48
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858
<data key="fieldName">min_height</data>
5959
<data key="value">100</data>
6060
</entity>
61+
<entity name="PageBuilderSlideItemMinimumHeight_100px" type="pagebuilder_slide_item_minimum_height_property">
62+
<data key="name">Minimum Height</data>
63+
<data key="section">appearance_fieldset</data>
64+
<data key="fieldName">min_height</data>
65+
<data key="value">100px</data>
66+
</entity>
6167
<entity name="PageBuilderSlideItemMinimumHeight_Empty" type="pagebuilder_slide_item_minimum_height_property">
6268
<data key="name">Minimum Height</data>
6369
<data key="section">appearance_fieldset</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,24 @@
9999
<data key="fieldName">min_height</data>
100100
<data key="value">300</data>
101101
</entity>
102+
<entity name="PageBuilderSliderMinHeightPx_Default" type="pagebuilder_slider_min_height_property">
103+
<data key="name">Minimum Height</data>
104+
<data key="section">appearance_fieldset</data>
105+
<data key="fieldName">min_height</data>
106+
<data key="value">300px</data>
107+
</entity>
102108
<entity name="PageBuilderSliderMinHeight_100" type="pagebuilder_slider_min_height_property">
103109
<data key="name">Minimum Height</data>
104110
<data key="section">appearance_fieldset</data>
105111
<data key="fieldName">min_height</data>
106112
<data key="value">100</data>
107113
</entity>
114+
<entity name="PageBuilderSliderMinHeight_100px" type="pagebuilder_slider_min_height_property">
115+
<data key="name">Minimum Height</data>
116+
<data key="section">appearance_fieldset</data>
117+
<data key="fieldName">min_height</data>
118+
<data key="value">100px</data>
119+
</entity>
108120
<!-- Container Height -->
109121
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
110122
<data key="value">360</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="infiniteLoop" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-infinite-loop='{{arg2}}']" parameterized="true"/>
2424
<element name="showArrows" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-arrows='{{arg2}}']" parameterized="true"/>
2525
<element name="showDots" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-dots='{{arg2}}']" parameterized="true"/>
26-
<element name="minHeight" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][contains(@style,'min-height: {{arg2}}')]" parameterized="true"/>
26+
<element name="minHeight" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
2727
<element name="noMinHeight" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
2828
<!-- Advanced Configuration -->
2929
<element name="alignment" type="text" selector="(//div[@data-content-type='slider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTests.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@
12251225
<argument name="property" value="PageBuilderSliderShowDots_Enabled"/>
12261226
</actionGroup>
12271227
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSliderMinHeight">
1228-
<argument name="property" value="PageBuilderSliderMinHeight_500"/>
1228+
<argument name="property" value="PageBuilderMinHeightProperty_500px"/>
12291229
</actionGroup>
12301230
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
12311231
<!-- Add Slide 2 -->
@@ -1238,7 +1238,7 @@
12381238
<argument name="targetIndex" value="2"/>
12391239
</actionGroup>
12401240
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeight">
1241-
<argument name="property" value="PageBuilderSlideItemMinimumHeight_Empty"/>
1241+
<argument name="property" value="PageBuilderMinHeightProperty_Empty"/>
12421242
</actionGroup>
12431243
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
12441244
<argument name="property" value="PageBuilderSlideItemContent_Slide2"/>
@@ -1254,7 +1254,7 @@
12541254
<seeElement selector="{{SliderOnStage.infiniteLoop('1', PageBuilderSliderInfiniteLoop_Enabled.value)}}" stepKey="seeInfiniteLoopCMSBlockStage"/>
12551255
<seeElement selector="{{SliderOnStage.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSBlockStage"/>
12561256
<seeElement selector="{{SliderOnStage.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSBlockStage"/>
1257-
<seeElement selector="{{SliderOnStage.minHeight('1', PageBuilderSliderMinHeight_500.value)}}" stepKey="seeMinHeightCMSBlockStage"/>
1257+
<seeElement selector="{{SliderOnStage.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinHeightCMSBlockStage"/>
12581258
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSBlockStage">
12591259
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>
12601260
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
@@ -1309,7 +1309,7 @@
13091309
<seeElement selector="{{SliderOnFrontend.infiniteLoop('1', PageBuilderSliderInfiniteLoop_Enabled.value)}}" stepKey="seeInfiniteLoopCMSPageStage"/>
13101310
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStage"/>
13111311
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStage"/>
1312-
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderSliderMinHeight_500.value)}}" stepKey="seeHeightCMSPageStage"/>
1312+
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeHeightCMSPageStage"/>
13131313
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSPageStage">
13141314
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
13151315
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
@@ -1327,7 +1327,7 @@
13271327
<seeElement selector="{{SliderOnFrontend.infiniteLoop('1', PageBuilderSliderInfiniteLoop_Enabled.value)}}" stepKey="seeInfiniteLoopCMSPageStorefront"/>
13281328
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStorefront"/>
13291329
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStorefront"/>
1330-
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderSliderMinHeight_500.value)}}" stepKey="seeHeightCMSPageStorefront"/>
1330+
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeHeightCMSPageStorefront"/>
13311331
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSPageStorefront">
13321332
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
13331333
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
@@ -1416,7 +1416,7 @@
14161416
<argument name="property" value="PageBuilderSlideItemSlideName_Slide1"/>
14171417
</actionGroup>
14181418
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeight">
1419-
<argument name="property" value="PageBuilderSlideItemMinimumHeight_500"/>
1419+
<argument name="property" value="PageBuilderMinHeightProperty_500px"/>
14201420
</actionGroup>
14211421
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setBackgroundColor">
14221422
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
@@ -1471,7 +1471,7 @@
14711471
<seeElement selector="{{SlideOnBackend.slideName('1', PageBuilderSlideItemSlideName_Slide1.value)}}" stepKey="seeSlideNameCMSBlockStage"/>
14721472
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverSlideDotCMSBlockStage"/>
14731473
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipCMSBlockStage"/>
1474-
<seeElement selector="{{SlideOnBackend.posterMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
1474+
<seeElement selector="{{SlideOnBackend.posterMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
14751475
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSBlockStage">
14761476
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>
14771477
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
@@ -1533,7 +1533,7 @@
15331533
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStage">
15341534
<argument name="page" value="SlideOnFrontend"/>
15351535
</actionGroup>
1536-
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSPageStage"/>
1536+
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStage"/>
15371537
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStage">
15381538
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
15391539
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
@@ -1577,7 +1577,7 @@
15771577
<argument name="page" value="SlideOnFrontend"/>
15781578
</actionGroup>
15791579
<seeElement selector="{{SlideOnFrontend.slideName('1', PageBuilderSlideItemSlideName_Slide1.value)}}" stepKey="seeSlideNameCMSPageStorefront"/>
1580-
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSPageStorefront"/>
1580+
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStorefront"/>
15811581
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStorefront">
15821582
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
15831583
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
@@ -1671,7 +1671,7 @@
16711671
<actionGroup ref="validateOverlayPositionCollageLeft" stepKey="validateOverlayPositionCMSBlockStage">
16721672
<argument name="page" value="SlideOnBackend"/>
16731673
</actionGroup>
1674-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
1674+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
16751675
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="moveMouseOverSlideCMSBlockStage"/>
16761676
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
16771677
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceCMSPageStage"/>
@@ -1713,7 +1713,7 @@
17131713
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSBlockStage">
17141714
<argument name="page" value="SlideOnBackend"/>
17151715
</actionGroup>
1716-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
1716+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
17171717
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSBlockStage"/>
17181718
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
17191719
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStage"/>
@@ -1755,7 +1755,7 @@
17551755
<actionGroup ref="validateOverlayPositionCollageRight" stepKey="validateOverlayPositionCMSBlockStage">
17561756
<argument name="page" value="SlideOnBackend"/>
17571757
</actionGroup>
1758-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
1758+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
17591759
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="moveMouseOverSlideCMSBlockStage"/>
17601760
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
17611761
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageRight.value)}}" stepKey="seeAppearanceCMSPageStage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTests.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@
491491
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
492492
</actionGroup>
493493
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage"/>
494-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage"/>
494+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightStage"/>
495495
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
496496
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
497497
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
@@ -501,7 +501,7 @@
501501
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
502502
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
503503
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage2"/>
504-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage2"/>
504+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightStage2"/>
505505
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
506506
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
507507
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTests.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
420420
</actionGroup>
421421
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceStage"/>
422-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage"/>
422+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightStage"/>
423423
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
424424
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
425425
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
@@ -429,7 +429,7 @@
429429
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
430430
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
431431
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceStage2"/>
432-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage2"/>
432+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightStage2"/>
433433
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
434434
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
435435
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
@@ -477,7 +477,7 @@
477477
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
478478
</actionGroup>
479479
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
480-
<argument name="property" value="PageBuilderSlideItemMinimumHeight_300"/>
480+
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
481481
</actionGroup>
482482
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
483483
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>

0 commit comments

Comments
 (0)