Skip to content

Commit 1e5a759

Browse files
anthoulaanthoula
committed
Merge branch 'MC-5079-box-sizing' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection.xml
2 parents 1beb2c4 + 2a48aad commit 1e5a759

37 files changed

+876
-31
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,11 @@
4444
<argument name="minHeight"/>
4545
<argument name="padding"/>
4646
<argument name="index" defaultValue="1" type="string"/>
47-
<!-- Remove storefrontBugOffset when MC-5079 is resolved -->
48-
<argument name="storefrontBugOffset" defaultValue="0" type="string"/>
4947
</arguments>
5048
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{index}}-1].clientHeight;" stepKey="containerHeight"/>
51-
<executeJS function="return {$containerHeight}-{{storefrontBugOffset}}" stepKey="minusBugOffset"/>
5249
<assertGreaterThanOrEqual stepKey="assertContainerHeightGreaterThanOrEqualMinHeight">
5350
<expectedResult type="string">{{minHeight}}</expectedResult>
54-
<actualResult type="variable">minusBugOffset</actualResult>
51+
<actualResult type="variable">containerHeight</actualResult>
5552
</assertGreaterThanOrEqual>
5653
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{index}}-1].getBoundingClientRect().bottom-{{padding.paddingBottom}}" stepKey="containerBottomPositionMinusPadding"/>
5754
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{index}}-1].getBoundingClientRect().bottom" stepKey="contentBottomPosition"/>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,52 @@
3030
<waitForElementVisible selector="{{page.minHeight(index, minHeight.value)}}" stepKey="waitForMinHeight"/>
3131
<waitForElementVisible selector="{{page.verticalAlignContainer(index, verticalAlignContainer.value)}}" stepKey="waitForVerticalAlignContainer"/>
3232
</actionGroup>
33+
<!-- Validate Min Height -->
34+
<actionGroup name="validateContentTypeHeightEqualToMinHeight">
35+
<arguments>
36+
<argument name="content" type="string"/>
37+
<argument name="index" defaultValue="1" type="string"/>
38+
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
39+
<argument name="height" defaultValue="PageBuilderMinHeightProperty_300"/>
40+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
41+
<argument name="pixelBuffer" defaultValue="5" type="string"/>
42+
</arguments>
43+
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{padding.paddingTop}}-{{padding.paddingBottom}}-({{border.value}}*2)" stepKey="actualContentHeight"/>
44+
<executeJS function="return Math.round(Math.abs({$actualContentHeight}-{{height.value}}))" stepKey="contentTypeHeightDifference"/>
45+
<assertLessThanOrEqual stepKey="assertContentHeightRatio">
46+
<expectedResult type="int">{{pixelBuffer}}</expectedResult>
47+
<actualResult type="variable">contentTypeHeightDifference</actualResult>
48+
</assertLessThanOrEqual>
49+
</actionGroup>
50+
<actionGroup name="validateContentTypeHeightGreaterThanMinHeight">
51+
<arguments>
52+
<argument name="content" type="string"/>
53+
<argument name="index" defaultValue="1" type="string"/>
54+
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
55+
<argument name="height" defaultValue="PageBuilderMinHeightProperty_300"/>
56+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
57+
</arguments>
58+
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{padding.paddingTop}}-{{padding.paddingBottom}}-({{border.value}}*2)" stepKey="actualContentHeight"/>
59+
<assertGreaterThan stepKey="assertContentTypeHeightGreaterThanMinHeight">
60+
<expectedResult type="int">{{height.value}}</expectedResult>
61+
<actualResult type="variable">actualContentHeight</actualResult>
62+
</assertGreaterThan>
63+
</actionGroup>
64+
<!-- Validate Max Width -->
65+
<actionGroup name="validateContentTypeWidthEqualToMaxWidth">
66+
<arguments>
67+
<argument name="content" type="string"/>
68+
<argument name="index" defaultValue="1" type="string"/>
69+
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
70+
<argument name="width" defaultValue="PageBuilderVideoWidth_500"/>
71+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
72+
<argument name="pixelBuffer" defaultValue="5" type="string"/>
73+
</arguments>
74+
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().width-{{padding.paddingLeft}}-{{padding.paddingRight}}-({{border.value}}*2)" stepKey="actualContentWidth"/>
75+
<executeJS function="return Math.round(Math.abs({$actualContentWidth}-{{width.value}}))" stepKey="contentTypeWidthDifference"/>
76+
<assertLessThanOrEqual stepKey="assertContentWidthDifference">
77+
<expectedResult type="int">{{pixelBuffer}}</expectedResult>
78+
<actualResult type="variable">contentTypeWidthDifference</actualResult>
79+
</assertLessThanOrEqual>
80+
</actionGroup>
3381
</actionGroups>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
<data key="fieldName">min_height</data>
4141
<data key="value">300</data>
4242
</entity>
43+
<entity name="PageBuilderSlideItemMinimumHeight_100" type="pagebuilder_slide_item_minimum_height_property">
44+
<data key="name">Minimum Height</data>
45+
<data key="section">appearance_fieldset</data>
46+
<data key="fieldName">min_height</data>
47+
<data key="value">100</data>
48+
</entity>
4349
<!-- Background Color -->
4450
<entity name="PageBuilderSlideItemBackgroundColor_Empty" type="pagebuilder_slide_item_background_color_property">
4551
<data key="name">Background Color</data>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1414
<element name="hidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
1515
<element name="notHidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
16+
<element name="wrapperCSS" type="button" selector="[data-role=banner] [data-element=wrapper]"/>
1617
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1718
<element name="overlay" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='overlay']" parameterized="true"/>
1819
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
@@ -69,6 +70,7 @@
6970
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
7071
<element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
7172
<element name="notHidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
73+
<element name="wrapperCSS" type="button" selector="[data-role=banner] [data-element=wrapper]"/>
7274
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
7375
<element name="overlay" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-banner')])[{{arg1}}]//div[@data-element='overlay']" parameterized="true"/>
7476
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="ColumnOnBackend">
1212
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
1313
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=column]')[{{arg1}} - 1]" parameterized="true"/>
14+
<element name="baseCSS" type="text" selector="div.pagebuilder-content-type.pagebuilder-column"/>
1415
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
1516
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true"/>
1617
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>
@@ -52,6 +53,7 @@
5253
<section name="ColumnOnFrontend">
5354
<element name="base" type="block" selector="(//div[@data-role='column'])[{{arg1}}]" parameterized="true"/>
5455
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=column]')[{{arg1}} - 1]" parameterized="true"/>
56+
<element name="baseCSS" type="text" selector="[data-role=column]"/>
5557
<element name="columnGroup" type="block" selector=".pagebuilder-column-group"/>
5658
<element name="allColumns" type="block" selector="(//div[@data-role='column'])"/>
5759
<element name="columnX" type="block" selector="[data-role=column]:nth-child({{arg1}})" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="MapOnStage">
1212
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]" parameterized="true"/>
1313
<element name="baseCSS" type="button" selector="[data-role=map]"/>
14+
<element name="mainCSS" type="button" selector="[data-role=map][data-element=main]"/>
1415
<element name="clickablePin" type="button" selector="((//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//map//area)[{{arg2}}]" parameterized="true"/>
1516
<element name="allPins" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//img[not(@usemap) and contains(@src,'spotlight-poi2_hdpi.png')]|(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//img[not(@usemap) and contains(@src,'spotlight-poi2.png')]" parameterized="true"/>
1617
<element name="pinLocations" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@style,'transform: matrix(1, 0, 0, 1, ')]" parameterized="true"/>
@@ -52,6 +53,7 @@
5253
<section name="MapOnStorefront">
5354
<element name="emptyMap" type="button" selector="(//div[@data-role='map'])[{{arg1}}][not(@src) and contains(@style,'display: none;')]" parameterized="true"/>
5455
<element name="base" type="button" selector="(//div[@data-role='map'])[{{arg1}}]" parameterized="true"/>
56+
<element name="baseCSS" type="button" selector="[data-role=map][data-element=main]"/>
5557
<element name="baseJS" type="text" selector="document.querySelectorAll('div[data-role=\'map\']')[{{arg1}}]" parameterized="true"/>
5658
<element name="allPins" type="button" selector="(//div[@data-role='map'])[{{arg1}}]//img[not(@usemap) and contains(@src,'spotlight-poi2_hdpi.png')]|(//div[@data-role='map'])[{{arg1}}]//img[not(@usemap) and contains(@src,'spotlight-poi2.png')]" parameterized="true"/>
5759
<element name="clickablePin" type="button" selector="((//div[@data-role='map'])[{{arg1}}]//map//area)[{{arg2}}]" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row]')[{{arg1}} - 1]" parameterized="true"/>
2929
<element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
3030
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
31-
<element name="baseCss" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>
31+
<element name="baseCSS" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>
3232
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'row-container')])[{{arg1}}]" parameterized="true"/>
3333
<element name="displayLabel" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]//div[contains(@class,'pagebuilder-display-label')]" parameterized="true"/>
3434
<element name="rowChildrenStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style, '{{arg2}}')]" parameterized="true"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<section name="SliderOnStage">
3838
<element name="all" type="button" selector="div[data-role=slider]"/>
3939
<element name="base" type="button" selector="(//div[@data-role='slider'])[{{arg1}}]" parameterized="true"/>
40+
<element name="containerCSS" type="text" selector="[data-role=slider] .slider-container"/>
4041
<element name="hidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
4142
<element name="notHidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
4243
<element name="slideNavigationDot" type="button" selector="(//div[@data-role='slider'])[{{arg1}}]//div[contains(@class,'navigation-dot')][{{arg2}}]" parameterized="true"/>
@@ -69,6 +70,7 @@
6970
<element name="base" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]" parameterized="true"/>
7071
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-role=slide] div.pagebuilder-slide-wrapper')[{{arg1}} - 1]" parameterized="true"/>
7172
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=slide] div.pagebuilder-slide-wrapper')[{{arg1}} - 1]" parameterized="true"/>
73+
<element name="wrapperCSS" type="button" selector="[data-role=slide] .pagebuilder-slide-wrapper"/>
7274
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=slide] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
7375
<element name="slickSlideIndex" type="text" selector="[data-slick-index='{{arg1}}']" parameterized="true"/>
7476
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-role=slide]')).boxSizing"/>
@@ -126,6 +128,7 @@
126128
<element name="base" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]" parameterized="true"/>
127129
<element name="emptySlide" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content'][contains(@class,'pagebuilder-empty-slide') and text()='Edit Slide Text']" parameterized="true"/>
128130
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=slider] div.pagebuilder-slide-wrapper')[{{arg1}} - 1]" parameterized="true"/>
131+
<element name="wrapperCSS" type="button" selector="[data-role=slider] .pagebuilder-slide-wrapper"/>
129132
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=slider] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
130133
<element name="editableButtonItemElement" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button']//span[contains(@contenteditable, 'true')]" parameterized="true"/>
131134
<element name="imageSourceByIndex" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'{{arg2}}')]" parameterized="true"/>

0 commit comments

Comments
 (0)