Skip to content

Commit b8e4848

Browse files
davemacaulaydavemacaulay
committed
Merge branch '1.1-develop' into MC-15981
2 parents 9519497 + 7bb9a1b commit b8e4848

File tree

11 files changed

+136
-8
lines changed

11 files changed

+136
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</entity>
108108
<!-- Container Height -->
109109
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
110-
<data key="value">368</data>
110+
<data key="value">360</data>
111111
</entity>
112112
<!-- CSS Classes -->
113113
<entity name="PageBuilderSliderAdvancedCssClasses_Default" type="pagebuilder_advanced_css_classes_property">

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,8 @@
5050
<data key="fieldName">max_width</data>
5151
<data key="value">500</data>
5252
</entity>
53+
<!-- Height -->
54+
<entity name="PageBuilderVideoContainerHeight" type="pagebuilder_video_height_property">
55+
<data key="value">281</data>
56+
</entity>
5357
</entities>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="VideoOnStage">
12+
<element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
1213
<element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
1314
<!-- Empty Video -->
1415
<element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
@@ -36,6 +37,7 @@
3637
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3738
</section>
3839
<section name="VideoOnStorefront">
40+
<element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
3941
<element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
4042
<!-- Empty Video -->
4143
<element name="empty" type="text" selector="//div[@data-content-type='video'][count(iframe)=0]"/>

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,70 @@
616616
<argument name="padding" value="PageBuilderPaddingProperty10"/>
617617
</actionGroup>
618618
</test>
619+
<test name="SliderWithNoDotsEqualToMinHeight" extends="RowWithBordersAndPaddingEqualToMinHeight">
620+
<annotations>
621+
<features value="PageBuilder"/>
622+
<stories value="Slider"/>
623+
<title value="Slider with no dots is equal to min height"/>
624+
<description value="A user can see Slider height with no dots is equal to min height"/>
625+
<severity value="AVERAGE"/>
626+
<useCaseId value="MC-15742"/>
627+
<testCaseId value="MC-18088"/>
628+
<group value="pagebuilder"/>
629+
<group value="pagebuilder-slide"/>
630+
<group value="pagebuilder-sliderCommon"/>
631+
</annotations>
632+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
633+
<argument name="contentType" value="PageBuilderSliderContentType"/>
634+
</actionGroup>
635+
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandMenuSection">
636+
<argument name="contentType" value="PageBuilderSliderContentType"/>
637+
</actionGroup>
638+
<actionGroup ref="dragContentTypeToStage" after="commentConfigureContentType" stepKey="dragContentTypeToStage">
639+
<argument name="contentType" value="PageBuilderSliderContentType"/>
640+
</actionGroup>
641+
<actionGroup ref="unFocusOptionMenu" after="dragContentTypeToStage" stepKey="unfocusSlideOptions">
642+
<argument name="contentType" value="PageBuilderSlideContentType"/>
643+
</actionGroup>
644+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel">
645+
<argument name="contentType" value="PageBuilderSliderContentType"/>
646+
</actionGroup>
647+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
648+
<argument name="property" value="PageBuilderSliderMinHeight_Default"/>
649+
</actionGroup>
650+
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" after="enterMinHeightProperty" stepKey="enterShowDotsDisabled">
651+
<argument name="property" value="PageBuilderSliderShowDots_Disabled"/>
652+
</actionGroup>
653+
<remove keyForRemoval="enterBorder"/>
654+
<remove keyForRemoval="enterBorderColor"/>
655+
<remove keyForRemoval="enterBorderWidth"/>
656+
<remove keyForRemoval="enterPadding"/>
657+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" after="saveEditPanelSettings" stepKey="openSlideItemEditPanel">
658+
<argument name="section" value="SlideOnBackend"/>
659+
</actionGroup>
660+
<actionGroup ref="fillSlideOutPanelFieldGeneral" after="openSlideItemEditPanel" stepKey="enterMinHeightPropertySlideItem">
661+
<argument name="property" value="PageBuilderSlideItemMinimumHeight_300"/>
662+
</actionGroup>
663+
<actionGroup ref="fillSlideOutPanelField" after="enterMinHeightPropertySlideItem" stepKey="enterBackgroundColor">
664+
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
665+
</actionGroup>
666+
<actionGroup ref="saveEditPanelSettings" after="enterBackgroundColor" stepKey="saveEditPanelSettings2"/>
667+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
668+
<argument name="content" value="{{SliderOnStage.containerCSS}}"/>
669+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
670+
</actionGroup>
671+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
672+
<argument name="content" value="{{SliderOnStage.containerCSS}}"/>
673+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
674+
</actionGroup>
675+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
676+
<argument name="contentType" value="PageBuilderSliderContentType"/>
677+
</actionGroup>
678+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightStorefront">
679+
<argument name="content" value="{{SliderOnFrontend.all}}"/>
680+
<argument name="height" value="PageBuilderSliderMinHeight_Default"/>
681+
</actionGroup>
682+
</test>
619683
<test name="SliderMoveSlider">
620684
<annotations>
621685
<features value="PageBuilder"/>

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,62 @@
635635
<argument name="content" value="{{VideoOnStorefront.wrapperCSS}}"/>
636636
</actionGroup>
637637
</test>
638+
<test name="VideoHeightRendersCorrectlyBasedOnMaxWidthAndAspectRatio" extends="RowWithBordersAndPaddingEqualToMinHeight">
639+
<annotations>
640+
<features value="PageBuilder"/>
641+
<stories value="Video"/>
642+
<title value="Video height is based on max width and aspect ratio"/>
643+
<description value="A user can see Video height is based on max width and aspect ratio"/>
644+
<severity value="AVERAGE"/>
645+
<useCaseId value="MC-15812"/>
646+
<testCaseId value="MC-18149"/>
647+
<group value="pagebuilder"/>
648+
<group value="pagebuilder-video"/>
649+
</annotations>
650+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
651+
<argument name="contentType" value="PageBuilderVideoContentType"/>
652+
</actionGroup>
653+
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandMenuSection">
654+
<argument name="contentType" value="PageBuilderVideoContentType"/>
655+
</actionGroup>
656+
<actionGroup ref="dragContentTypeToStage" after="commentConfigureContentType" stepKey="dragContentTypeToStage">
657+
<argument name="contentType" value="PageBuilderVideoContentType"/>
658+
</actionGroup>
659+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel">
660+
<argument name="contentType" value="PageBuilderVideoContentType"/>
661+
</actionGroup>
662+
<actionGroup ref="fillSlideOutPanelFieldGeneral" after="openEditPanel" stepKey="enterVideoUrlProperty">
663+
<argument name="property" value="PageBuilderVideoUrl_YouTube"/>
664+
</actionGroup>
665+
<actionGroup ref="fillSlideOutPanelFieldGeneral" after="enterVideoUrlProperty" stepKey="enterWidthProperty">
666+
<argument name="property" value="PageBuilderVideoWidth_500"/>
667+
</actionGroup>
668+
<remove keyForRemoval="enterMinHeightProperty"/>
669+
<remove keyForRemoval="enterBorder"/>
670+
<remove keyForRemoval="enterBorderColor"/>
671+
<remove keyForRemoval="enterBorderWidth"/>
672+
<remove keyForRemoval="enterPadding"/>
673+
<comment userInput="Validate height on stage before save" stepKey="commentValidateHeightOnStageBeforeSave"/>
674+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
675+
<argument name="content" value="{{VideoOnStage.mainCSS}}"/>
676+
<argument name="height" value="PageBuilderVideoContainerHeight"/>
677+
<argument name="pixelBuffer" value="2"/>
678+
</actionGroup>
679+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
680+
<argument name="content" value="{{VideoOnStage.mainCSS}}"/>
681+
<argument name="height" value="PageBuilderVideoContainerHeight"/>
682+
<argument name="pixelBuffer" value="2"/>
683+
</actionGroup>
684+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
685+
<argument name="contentType" value="PageBuilderVideoContentType"/>
686+
</actionGroup>
687+
<comment userInput="Validate height on storefront" stepKey="commentValidateHeightOnStorefront"/>
688+
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightStorefront">
689+
<argument name="content" value="{{VideoOnStorefront.mainCSS}}"/>
690+
<argument name="height" value="PageBuilderVideoContainerHeight"/>
691+
<argument name="pixelBuffer" value="2"/>
692+
</actionGroup>
693+
</test>
638694
<test name="VideoValidateURL">
639695
<annotations>
640696
<features value="PageBuilder"/>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.slider-controls {
78-
padding: 14px 0;
78+
padding: 10px 0;
7979
text-align: center;
8080

8181
.slider-navigation {
@@ -334,11 +334,10 @@
334334
display: block;
335335
}
336336
.slick-dots {
337-
bottom: -30px;
338337
display: block;
339338
list-style: none;
340339
margin: 0;
341-
padding: 0;
340+
padding: 15px 0;
342341
text-align: center;
343342
width: 100%;
344343
li {

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
div[data-content-type='video'],
2424
.pagebuilder-video {
25+
font-size: 0;
26+
2527
.pagebuilder-video-inner {
2628
box-sizing: border-box;
2729
display: inline-block;

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
[data-content-type='slide'] {
1111
box-sizing: border-box;
12+
line-height: 20px;
1213
min-height: inherit;
1314
overflow: hidden;
1415

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ div[data-content-type='slider'] {
1212

1313
&.slick-initialized {
1414
display: block;
15-
margin-bottom: 35px !important; // required due to inline styles added by Slick
1615
}
1716

1817
.slick-list,
@@ -21,6 +20,7 @@ div[data-content-type='slider'] {
2120
min-height: inherit;
2221

2322
> div {
23+
line-height: 0;
2424
min-height: inherit;
2525
overflow: hidden;
2626
width: 100%;

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// _____________________________________________
99

1010
div[data-content-type='video'] {
11+
font-size: 0;
12+
1113
.pagebuilder-video-inner {
1214
box-sizing: border-box;
1315
display: inline-block;

0 commit comments

Comments
 (0)