Skip to content

Commit f0e6334

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Added Mftf fixes
1 parent f223a81 commit f0e6334

File tree

11 files changed

+40
-15
lines changed

11 files changed

+40
-15
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
<argument name="containerDefaultHeight" defaultValue="1"/>
1515
<argument name="expectedPaddingTop" defaultValue="1"/>
1616
<argument name="expectedPaddingBottom" defaultValue="1"/>
17+
<argument name="expectedBorder" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1718
</arguments>
1819
<executeJS function="{{PageBuilderStage.computedHeightOnStage(contentType.role,index)}}" stepKey="actualStageContentTypeHeight"/>
19-
<executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}})" stepKey="expectedContentTypeHeightWithPadding"/>
20+
<executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}}+({{expectedBorderWidth.value}}*2))" stepKey="expectedContentTypeHeightWithPadding"/>
2021
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
2122
<expectedResult type="variable">actualStageContentTypeHeight</expectedResult>
2223
<actualResult type="variable">expectedContentTypeHeightWithPadding</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStorefrontSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="width" type="text" selector="(//div[@data-content-type='divider'])[{{arg1}}]//hr[contains(@style,'width: {{arg2}};')]" parameterized="true"/>
2424
<element name="noWidth" type="text" selector="(//div[@data-content-type='divider'])[{{arg1}}]//hr[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
2525
<!-- Advanced Configuration -->
26-
<element name="advancedConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;divider&quot;])[{{arg1}}][@data-pb-style]" parameterized="true"/>
26+
<element name="advancedConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;divider&quot;])[{{arg1}}]" parameterized="true"/>
2727
<element name="alignment" type="text" selector="(//div[@data-content-type='divider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]//hr[contains(@style,'display: inline-block;')]" parameterized="true" deprecated="Styles are not inline"/>
2828
<element name="noAlignment" type="text" selector="(//div[@data-content-type='divider'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true" deprecated="Styles are not inline"/>
2929
<element name="border" type="text" selector="(//div[@data-content-type='divider'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
151151
<argument name="cssProperty" value="minHeight"/>
152152
</actionGroup>
153-
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[0].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2)-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2)" stepKey="firstSliderMinHeightCMSBlockStage"/>
153+
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[0].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthProperty1.value}}*2)" stepKey="firstSliderMinHeightCMSBlockStage"/>
154154
<executeJS function="return document.querySelectorAll('{{SlideOnBackend.wrapperCSS}}')[0].getBoundingClientRect().height" stepKey="firstSlideMinHeightCMSBlockStage"/>
155155
<assertEquals stepKey="assertFirstSliderMinHeightCMSBlockStage">
156156
<actualResult type="variable">firstSliderMinHeightCMSBlockStage</actualResult>
@@ -166,7 +166,7 @@
166166
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200.value}}"/>
167167
<argument name="cssProperty" value="minHeight"/>
168168
</actionGroup>
169-
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[1].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2)" stepKey="secondSliderMinHeightCMSBlockStage"/>
169+
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[1].getBoundingClientRect().height" stepKey="secondSliderMinHeightCMSBlockStage"/>
170170
<executeJS function="return document.querySelectorAll('{{SlideOnBackend.wrapperCSS}}')[1].getBoundingClientRect().height" stepKey="secondSlideMinHeightCMSBlockStage"/>
171171
<assertEquals stepKey="assertSecondSliderMinHeightCMSBlockStage">
172172
<actualResult type="variable">secondSliderMinHeightCMSBlockStage</actualResult>
@@ -178,7 +178,7 @@
178178
</assertEquals>
179179
<comment userInput="BIC workaround" stepKey="seeThirdSliderMinHeightCMSBlockStage"/>
180180
<comment userInput="BIC workaround" stepKey="seeThirdSlideHeightCMSBlockStage"/>
181-
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[2].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2*2)" stepKey="thirdSliderMinHeightCMSBlockStage"/>
181+
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[2].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthProperty1.value}}*2)" stepKey="thirdSliderMinHeightCMSBlockStage"/>
182182
<executeJS function="return document.querySelectorAll('{{SlideOnBackend.wrapperCSS}}')[2].getBoundingClientRect().height" stepKey="thirdSlideMinHeightCMSBlockStage"/>
183183
<assertEquals stepKey="assertThirdSliderMinHeightCMSBlockStage">
184184
<actualResult type="variable">thirdSliderMinHeightCMSBlockStage</actualResult>
@@ -194,7 +194,7 @@
194194
<argument name="cssProperty" value="minHeight"/>
195195
</actionGroup>
196196
<comment userInput="BIC workaround" stepKey="seeFourthSlideHeightCMSBlockStage"/>
197-
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[3].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2*2)" stepKey="fourthSliderMinHeightCMSBlockStage"/>
197+
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[3].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthProperty1.value}}*2)" stepKey="fourthSliderMinHeightCMSBlockStage"/>
198198
<executeJS function="return document.querySelectorAll('{{SlideOnBackend.wrapperCSS}}')[3].getBoundingClientRect().height" stepKey="fourSlideMinHeightCMSBlockStage"/>
199199
<executeJS function="return Math.abs({$viewportHeightCMSBlockStage} - 200)" stepKey="expectedFourthHeightCMSBlockStage"/>
200200
<assertEquals stepKey="assertFourthSliderMinHeightCMSBlockStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsLargerSliderTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<argument name="containerDefaultHeight" value="PageBuilderEmptySliderContainerHeight"/>
5050
<argument name="expectedPaddingTop" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
5151
<argument name="expectedPaddingBottom" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
52+
<argument name="expectedBorder" value="PageBuilderAdvancedBorderWidthProperty1"/>
5253
</actionGroup>
5354
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderSliderContentType.role,'1')}}" stepKey="actualStageInitialSliderHeight"/>
5455
<comment userInput="Validate Row Height adjusts to Slider Height on Stage" stepKey="commentValidateRowHeightAdjustToSlider"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</actionGroup>
8080
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
8181
<argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
82-
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
82+
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowStage.value}}"/>
8383
<argument name="cssProperty" value="margin"/>
8484
</actionGroup>
8585
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,18 @@
2525
</actionGroup>
2626
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStage">
2727
<argument name="column" value="ColumnOnBackend"/>
28+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2829
<argument name="element" value="SlideOnBackend"/>
2930
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3032
<argument name="diffThreshold" value="2"/>
3133
</actionGroup>
3234
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3335
<argument name="column" value="ColumnOnFrontend"/>
36+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3437
<argument name="element" value="SlideOnFrontend"/>
3538
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3640
<argument name="diffThreshold" value="0"/>
3741
</actionGroup>
3842
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,18 @@
2525
</actionGroup>
2626
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStage">
2727
<argument name="column" value="ColumnOnBackend"/>
28+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2829
<argument name="element" value="SlideOnBackend"/>
2930
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3032
<argument name="diffThreshold" value="2"/>
3133
</actionGroup>
3234
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3335
<argument name="column" value="ColumnOnFrontend"/>
36+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3437
<argument name="element" value="SlideOnFrontend"/>
3538
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3640
<argument name="diffThreshold" value="0"/>
3741
</actionGroup>
3842
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,18 @@
2525
</actionGroup>
2626
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStage">
2727
<argument name="column" value="ColumnOnBackend"/>
28+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2829
<argument name="element" value="SlideOnBackend"/>
2930
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3032
<argument name="diffThreshold" value="2"/>
3133
</actionGroup>
3234
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3335
<argument name="column" value="ColumnOnFrontend"/>
36+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3437
<argument name="element" value="SlideOnFrontend"/>
3538
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
3640
<argument name="diffThreshold" value="0"/>
3741
</actionGroup>
3842
</test>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
4242
<argument name="contentType" value="PageBuilderColumnContentType"/>
4343
</actionGroup>
44+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openColumnEditPanel">
45+
<argument name="contentType" value="PageBuilderColumnContentType"/>
46+
</actionGroup>
47+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterColumnPadding">
48+
<argument name="property" value="PageBuilderPaddingProperty10"/>
49+
</actionGroup>
50+
<actionGroup ref="saveEditPanelSettings" stepKey="saveColumnEditPanelSettings"/>
4451
<!-- Add Slider to Stage -->
4552
<comment userInput="Add Slider to Stage" stepKey="addSliderToStage"/>
4653
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionMedia">
@@ -95,8 +102,10 @@
95102
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
96103
<actionGroup ref="validateOverlayAndButtonPoster" stepKey="validateSlideOnStage">
97104
<argument name="column" value="ColumnOnBackend"/>
105+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
98106
<argument name="element" value="SlideOnBackend"/>
99107
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
108+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
100109
<argument name="diffThreshold" value="2"/>
101110
</actionGroup>
102111
<!-- Validate Storefront -->
@@ -108,8 +117,10 @@
108117
</actionGroup>
109118
<actionGroup ref="validateOverlayAndButtonPoster" stepKey="validateSlideOnStorefront">
110119
<argument name="column" value="ColumnOnFrontend"/>
120+
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
111121
<argument name="element" value="SlideOnFrontend"/>
112122
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
123+
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
113124
<argument name="diffThreshold" value="0"/>
114125
</actionGroup>
115126
</test>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@
6666
<executeJS function="return document.querySelectorAll('[data-content-type=slide]')[1].getBoundingClientRect().right" stepKey="slideRightPosition"/>
6767
<executeJS function="return document.querySelectorAll('.slider-container.content-type-container')[0].getBoundingClientRect().left" stepKey="sliderLeftPosition"/>
6868
<executeJS function="return document.querySelectorAll('.slider-container.content-type-container')[0].getBoundingClientRect().right" stepKey="sliderRightPosition"/>
69-
<assertLessThan stepKey="assertSlideRightSideIsLessThanSliderRightSide">
69+
<assertLessThanOrEqual stepKey="assertSlideRightSideIsLessThanSliderRightSide">
7070
<expectedResult type="variable">sliderRightPosition</expectedResult>
7171
<actualResult type="variable">slideRightPosition</actualResult>
72-
</assertLessThan>
73-
<assertGreaterThan stepKey="assertSlideLeftSideIsGreaterThanSliderLeftSide">
72+
</assertLessThanOrEqual>
73+
<assertLessThanOrEqual stepKey="assertSlideLeftSideIsGreaterThanSliderLeftSide">
7474
<expectedResult type="variable">sliderLeftPosition</expectedResult>
7575
<actualResult type="variable">slideLeftPosition</actualResult>
76-
</assertGreaterThan>
76+
</assertLessThanOrEqual>
7777
<!-- Add Content To Slide 2 -->
7878
<comment userInput="Add Content To Slide 2" stepKey="commentAddContentToSlide2"/>
7979
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">

0 commit comments

Comments
 (0)