Skip to content

Commit 74ce92a

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

File tree

6 files changed

+82
-71
lines changed

6 files changed

+82
-71
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<waitForElementVisible selector="{{page.verticalAlignContainer(index, verticalAlignContainer.value)}}" stepKey="waitForVerticalAlignContainer"/>
4242
</actionGroup>
4343
<!-- Validate Min Height -->
44-
<actionGroup name="validateContentTypeHeightEqualToMinHeight">
44+
<actionGroup name="validateContentTypeHeightEqualToMinHeight" deprecated="Use validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder instead. Will be removed in PB-413.">
4545
<annotations>
4646
<description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
4747
</annotations>
@@ -60,6 +60,26 @@
6060
<actualResult type="variable">contentTypeHeightDifference</actualResult>
6161
</assertLessThanOrEqual>
6262
</actionGroup>
63+
<actionGroup name="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder">
64+
<annotations>
65+
<description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
66+
</annotations>
67+
<arguments>
68+
<argument name="content" type="string"/>
69+
<argument name="index" defaultValue="1" type="string"/>
70+
<argument name="borderWidth" defaultValue="{{PageBuilderAdvancedBorderWidthProperty0.value}}" type="string"/>
71+
<argument name="minHeight" defaultValue="{{PageBuilderMinHeightProperty_300px.intValue}}" type="string"/>
72+
<argument name="paddingTop" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingTop}}" type="string"/>
73+
<argument name="paddingBottom" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingBottom}}" type="string"/>
74+
<argument name="pixelBuffer" defaultValue="5" type="string"/>
75+
</arguments>
76+
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{paddingTop}}-{{paddingBottom}}-({{borderWidth}}*2)" stepKey="actualContentHeight"/>
77+
<executeJS function="return Math.round(Math.abs({$actualContentHeight}-{{minHeight}}))" stepKey="contentTypeHeightDifference"/>
78+
<assertLessThanOrEqual stepKey="assertContentHeightRatio">
79+
<expectedResult type="int">{{pixelBuffer}}</expectedResult>
80+
<actualResult type="variable">contentTypeHeightDifference</actualResult>
81+
</assertLessThanOrEqual>
82+
</actionGroup>
6383
<actionGroup name="validateContentTypeHeightGreaterThanMinHeight">
6484
<arguments>
6585
<argument name="content" type="string"/>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<data key="section">appearance_fieldset</data>
5151
<data key="fieldName">min_height</data>
5252
<data key="value">300px</data>
53+
<data key="intValue">300</data>
5354
<data key="style">min-height: 300px</data>
5455
</entity>
5556
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
@@ -67,6 +68,14 @@
6768
<data key="intValue">200</data>
6869
<data key="style">min-height: 200px</data>
6970
</entity>
71+
<entity name="PageBuilderMinHeightProperty_100px" type="pagebuilder_min_height_property">
72+
<data key="name">Minimum Height</data>
73+
<data key="section">appearance_fieldset</data>
74+
<data key="fieldName">min_height</data>
75+
<data key="value">100px</data>
76+
<data key="intValue">100</data>
77+
<data key="style">min-height: 100px</data>
78+
</entity>
7079
<entity name="PageBuilderMinHeightProperty_100vh" type="pagebuilder_min_height_property">
7180
<data key="name">Minimum Height</data>
7281
<data key="section">appearance_fieldset</data>

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,25 @@
4040
<data key="value">&#x3C;img src=x onerror=&#x22;throw &#x27;error&#x27;;&#x22; /&#x3E;</data>
4141
</entity>
4242
<!-- Minimum Height -->
43-
<entity name="PageBuilderSlideItemMinimumHeight_500" type="pagebuilder_slide_item_minimum_height_property">
43+
<entity name="PageBuilderSlideItemMinimumHeight_500" deprecated="PageBuilderMinHeightProperty_500px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
4444
<data key="name">Minimum Height</data>
4545
<data key="section">appearance_fieldset</data>
4646
<data key="fieldName">min_height</data>
4747
<data key="value">500</data>
4848
</entity>
49-
<entity name="PageBuilderSlideItemMinimumHeight_300" type="pagebuilder_slide_item_minimum_height_property">
49+
<entity name="PageBuilderSlideItemMinimumHeight_300" deprecated="PageBuilderMinHeightProperty_300px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
5050
<data key="name">Minimum Height</data>
5151
<data key="section">appearance_fieldset</data>
5252
<data key="fieldName">min_height</data>
5353
<data key="value">300</data>
5454
</entity>
55-
<entity name="PageBuilderSlideItemMinimumHeight_100" type="pagebuilder_slide_item_minimum_height_property">
55+
<entity name="PageBuilderSlideItemMinimumHeight_100" deprecated="PageBuilderMinHeightProperty_100px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
5656
<data key="name">Minimum Height</data>
5757
<data key="section">appearance_fieldset</data>
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>
67-
<entity name="PageBuilderSlideItemMinimumHeight_Empty" type="pagebuilder_slide_item_minimum_height_property">
61+
<entity name="PageBuilderSlideItemMinimumHeight_Empty" deprecated="PageBuilderMinHeightProperty_Empty entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
6862
<data key="name">Minimum Height</data>
6963
<data key="section">appearance_fieldset</data>
7064
<data key="fieldName">min_height</data>

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,36 +87,24 @@
8787
<data key="value">true</data>
8888
</entity>
8989
<!-- Minimum Height -->
90-
<entity name="PageBuilderSliderMinHeight_500" type="pagebuilder_slider_min_height_property">
90+
<entity name="PageBuilderSliderMinHeight_500" deprecated="PageBuilderMinHeightProperty_500px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
9191
<data key="name">Minimum Height</data>
9292
<data key="section">appearance_fieldset</data>
9393
<data key="fieldName">min_height</data>
9494
<data key="value">500</data>
9595
</entity>
96-
<entity name="PageBuilderSliderMinHeight_Default" type="pagebuilder_slider_min_height_property">
96+
<entity name="PageBuilderSliderMinHeight_Default" deprecated="PageBuilderMinHeightProperty_300px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
9797
<data key="name">Minimum Height</data>
9898
<data key="section">appearance_fieldset</data>
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>
108-
<entity name="PageBuilderSliderMinHeight_100" type="pagebuilder_slider_min_height_property">
102+
<entity name="PageBuilderSliderMinHeight_100" deprecated="PageBuilderMinHeightProperty_100px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
109103
<data key="name">Minimum Height</data>
110104
<data key="section">appearance_fieldset</data>
111105
<data key="fieldName">min_height</data>
112106
<data key="value">100</data>
113107
</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>
120108
<!-- Container Height -->
121109
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
122110
<data key="value">360</data>

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,9 +1255,9 @@
12551255
<seeElement selector="{{SliderOnStage.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSBlockStage"/>
12561256
<seeElement selector="{{SliderOnStage.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSBlockStage"/>
12571257
<seeElement selector="{{SliderOnStage.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinHeightCMSBlockStage"/>
1258-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSBlockStage">
1258+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightSlide1CMSBlockStage">
12591259
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>
1260-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
1260+
<argument name="height" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
12611261
<argument name="index" value="1"/>
12621262
</actionGroup>
12631263
<click selector="{{SliderOnStage.slideNavigationDot('1', '1')}}" stepKey="clickSlide1CMSBlockStage"/>
@@ -1278,9 +1278,9 @@
12781278
<click selector="{{SliderOnStage.nextSlideArrow('1')}}" stepKey="clickNextSlideArrowCMSBlockStage2"/>
12791279
<waitForPageLoad stepKey="waitForNextSlideCMSBlockStage2"/>
12801280
<seeElement selector="{{SlideOnBackend.messageContent('2', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeSlide2ContentCMSBlockStage3"/>
1281-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide2CMSBlockStage">
1281+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightSlide2CMSBlockStage">
12821282
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>
1283-
<argument name="height" value="PageBuilderSliderMinHeight_500"/>
1283+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
12841284
<argument name="index" value="2"/>
12851285
</actionGroup>
12861286
<!-- Add Block to CMS Page -->
@@ -1310,9 +1310,9 @@
13101310
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStage"/>
13111311
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStage"/>
13121312
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeHeightCMSPageStage"/>
1313-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSPageStage">
1313+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightSlide1CMSPageStage">
13141314
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1315-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
1315+
<argument name="height" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
13161316
<argument name="index" value="1"/>
13171317
</actionGroup>
13181318
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
@@ -1328,9 +1328,9 @@
13281328
<seeElement selector="{{SliderOnFrontend.showArrows('1', PageBuilderSliderShowArrows_Enabled.value)}}" stepKey="seeArrowsCMSPageStorefront"/>
13291329
<seeElement selector="{{SliderOnFrontend.showDots('1', PageBuilderSliderShowDots_Enabled.value)}}" stepKey="seeDotsCMSPageStorefront"/>
13301330
<seeElement selector="{{SliderOnFrontend.minHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeHeightCMSPageStorefront"/>
1331-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide1CMSPageStorefront">
1331+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightSlide1CMSPageStorefront">
13321332
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1333-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_300"/>
1333+
<argument name="height" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
13341334
<argument name="index" value="1"/>
13351335
</actionGroup>
13361336
<click selector="{{SliderOnFrontend.slideNavigationDot('1', '1')}}" stepKey="clickSlide1CMSPageStorefront"/>
@@ -1351,9 +1351,9 @@
13511351
<click selector="{{SliderOnFrontend.nextSlideArrow('1')}}" stepKey="clickNextSlideArrowCMSPageStorefront2"/>
13521352
<waitForPageLoad stepKey="waitForNextSlideCMSPageStorefront2"/>
13531353
<seeElement selector="{{SlideOnFrontend.messageContent('2', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeSlide2ContentCMSPageStorefront3"/>
1354-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightSlide2CMSPageStorefront">
1354+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightSlide2CMSPageStorefront">
13551355
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1356-
<argument name="height" value="PageBuilderSliderMinHeight_500"/>
1356+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
13571357
<argument name="index" value="2"/>
13581358
</actionGroup>
13591359
</test>
@@ -1472,9 +1472,9 @@
14721472
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverSlideDotCMSBlockStage"/>
14731473
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipCMSBlockStage"/>
14741474
<seeElement selector="{{SlideOnBackend.posterMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
1475-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSBlockStage">
1475+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSBlockStage">
14761476
<argument name="content" value="{{SlideOnBackend.wrapperCSS}}"/>
1477-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
1477+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
14781478
</actionGroup>
14791479
<actionGroup ref="validateBackgroundAttributesWithNoImageForSlide" stepKey="validateBackgroundAttributesCMSBlockStage">
14801480
<argument name="section" value="SlideOnBackend"/>
@@ -1534,9 +1534,9 @@
15341534
<argument name="page" value="SlideOnFrontend"/>
15351535
</actionGroup>
15361536
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStage"/>
1537-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStage">
1537+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStage">
15381538
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1539-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
1539+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
15401540
</actionGroup>
15411541
<actionGroup ref="validateBackgroundAttributesWithNoImageForSlide" stepKey="validateBackgroundAttributesCMSPageStage">
15421542
<argument name="section" value="SlideOnFrontend"/>
@@ -1578,9 +1578,9 @@
15781578
</actionGroup>
15791579
<seeElement selector="{{SlideOnFrontend.slideName('1', PageBuilderSlideItemSlideName_Slide1.value)}}" stepKey="seeSlideNameCMSPageStorefront"/>
15801580
<seeElement selector="{{SlideOnFrontend.minimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStorefront"/>
1581-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStorefront">
1581+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStorefront">
15821582
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1583-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
1583+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
15841584
</actionGroup>
15851585
<actionGroup ref="validateBackgroundAttributesWithNoImageForSlide" stepKey="validateBackgroundAttributesCMSPageStorefront">
15861586
<argument name="section" value="SlideOnFrontend"/>
@@ -1629,9 +1629,9 @@
16291629
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
16301630
<argument name="page" value="SlideOnFrontend"/>
16311631
</actionGroup>
1632-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStorefrontMobile">
1632+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStorefrontMobile">
16331633
<argument name="content" value="{{SlideOnFrontend.wrapperCSS}}"/>
1634-
<argument name="height" value="PageBuilderSlideItemMinimumHeight_500"/>
1634+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
16351635
</actionGroup>
16361636
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSPageStorefrontMobile">
16371637
<argument name="section" value="SlideOnFrontend"/>

0 commit comments

Comments
 (0)