Skip to content

Commit 6ac4107

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Column tests fixes
1 parent e266f7f commit 6ac4107

File tree

9 files changed

+29
-13
lines changed

9 files changed

+29
-13
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<argument name="column"/>
1313
<argument name="columnIndex" defaultValue="1" type="string"/>
1414
<argument name="columnBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
15-
<argument name="columnPadding" defaultValue="PageBuilderPaddingProperty10"/>
15+
<argument name="columnPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
1616
<argument name="element"/>
1717
<argument name="elementIndex" defaultValue="1" type="string"/>
1818
<argument name="elementBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<argument name="column"/>
1313
<argument name="columnIndex" defaultValue="1" type="string"/>
1414
<argument name="columnBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
15-
<argument name="columnPadding" defaultValue="PageBuilderPaddingProperty10"/>
15+
<argument name="columnPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
1616
<argument name="element"/>
1717
<argument name="elementIndex" defaultValue="1" type="string"/>
1818
<argument name="elementBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@
5555
<argument name="containerTargetIndex" value="2"/>
5656
<argument name="contentTypeIndex" value="1"/>
5757
</actionGroup>
58+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openColumn1EditMenuOnStage">
59+
<argument name="contentType" value="PageBuilderColumnContentType"/>
60+
</actionGroup>
61+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
62+
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
63+
</actionGroup>
64+
<actionGroup ref="saveEditPanelSettings" stepKey="saveColumn1EditPanelSettings"/>
5865
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
5966
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
6067
<!-- Validate CMS Block Stage -->
@@ -84,7 +91,7 @@
8491
<actualResult type="variable">columnRatio3CMSBlockStage</actualResult>
8592
</assertEquals>
8693
<executeJS function="return Math.round({$columnOneWidthCMSBlockStage}+{$columnTwoWidthCMSBlockStage}+{$columnThreeWidthCMSBlockStage}+{$columnFourWidthCMSBlockStage})" stepKey="totalColumnWidthCMSBlockStage"/>
87-
<executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}}-{{PageBuilderRowAffordanceWidth.value}} - 4 * {{PageBuilderMarginsPropertyColumnDefault.marginRight}})" stepKey="rowWidthCMSBlockStage"/>
94+
<executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}}-{{PageBuilderRowAffordanceWidth.value}} - 4 * {{PageBuilderMarginsPropertyColumnStage.marginRight}})" stepKey="rowWidthCMSBlockStage"/>
8895
<executeJS function="return Math.abs({$totalColumnWidthCMSBlockStage}-{$rowWidthCMSBlockStage})" stepKey="widthDifferenceCMSBlockStage"/>
8996
<assertLessThanOrEqual stepKey="assertWidthOfAllColumnsCMSBlockStage">
9097
<expectedResult type="int">2</expectedResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
</actionGroup>
5454
<!-- Update all background fields -->
5555
<comment userInput="Update all background fields" stepKey="commentFillBackgroundPanel"/>
56+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
57+
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
58+
</actionGroup>
5659
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
5760
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
5861
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
3737
<argument name="contentType" value="PageBuilderColumnContentType"/>
3838
</actionGroup>
39+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
40+
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
41+
</actionGroup>
3942
<!-- Validate Default Values -->
4043
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
4144
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBackgroundColor">
@@ -65,7 +68,7 @@
6568
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment">
6669
<argument name="property" value="PageBuilderBackgroundAttachment_Default"/>
6770
</actionGroup>
68-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
71+
<actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
6972
<!-- Validate Stage -->
7073
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
7174
<actionGroup ref="ValidateBackgroundConfigurationWithNoImageOrColorActionGroup" stepKey="validateStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<comment userInput="Validate Column Height adjusts to Tabs Height" stepKey="commentValidateColumnHeightWithTabs"/>
4141
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderTabsContentType.role,'1')}}" stepKey="actualStageTabsHeight"/>
4242
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageColumnHeightWithTabs"/>
43-
<executeJS function="return Math.round({$actualStageTabsHeight}+{{PageBuilderPaddingProperty10.paddingTop}}+{{PageBuilderPaddingProperty10.paddingBottom}}+{{PageBuilderColumnAffordanceHeight.value}})" stepKey="expectedColumnHeightWithTabsAndPadding"/>
43+
<executeJS function="return Math.round({$actualStageTabsHeight}+{{PageBuilderColumnAffordanceHeight.value}})" stepKey="expectedColumnHeightWithTabsAndPadding"/>
4444
<assertEquals stepKey="assertColumnHeightAdjustsToTabsHeight">
4545
<expectedResult type="variable">expectedColumnHeightWithTabsAndPadding</expectedResult>
4646
<actualResult type="variable">actualStageColumnHeightWithTabs</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
<actualResult type="variable">getCssClasses</actualResult>
6060
</assertEmpty>
6161
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
62-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
62+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
6363
</actionGroup>
6464
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
65-
<argument name="property" value="PageBuilderPaddingProperty10"/>
65+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
6666
</actionGroup>
6767
<!-- Check for border radius -->
6868
<actionGroup ref="validateSlideOutPanelField" stepKey="seeAdvancedBorderRadiusProperty">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,17 +138,17 @@
138138
<executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productImageCSS}}')[0].clientWidth" stepKey="productImageWidthFrontend"/>
139139
<executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productPriceContainer}}')[0].clientWidth" stepKey="productPriceContainerWidthFrontend"/>
140140
<executeJS function="return document.querySelectorAll('{{ProductsOnStorefront.productActions}}')[0].clientWidth" stepKey="productActionsWidthFrontend"/>
141-
<assertGreaterThan stepKey="assertColumnIsWiderThanProductImageFrontend">
141+
<assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductImageFrontend">
142142
<actualResult type="variable">firstColumnWidthFrontend</actualResult>
143143
<expectedResult type="variable">productImageWidthFrontend</expectedResult>
144-
</assertGreaterThan>
145-
<assertGreaterThan stepKey="assertColumnIsWiderThanProductPriceContainerFrontend">
144+
</assertGreaterThanOrEqual>
145+
<assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductPriceContainerFrontend">
146146
<actualResult type="variable">firstColumnWidthFrontend</actualResult>
147147
<expectedResult type="variable">productPriceContainerWidthFrontend</expectedResult>
148-
</assertGreaterThan>
149-
<assertGreaterThan stepKey="assertColumnIsWiderThanProductActionsFrontend">
148+
</assertGreaterThanOrEqual>
149+
<assertGreaterThanOrEqual stepKey="assertColumnIsWiderThanProductActionsFrontend">
150150
<actualResult type="variable">firstColumnWidthFrontend</actualResult>
151151
<expectedResult type="variable">productActionsWidthFrontend</expectedResult>
152-
</assertGreaterThan>
152+
</assertGreaterThanOrEqual>
153153
</test>
154154
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForRow">
4848
<argument name="contentType" value="PageBuilderRowContentType"/>
4949
</actionGroup>
50+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
51+
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
52+
</actionGroup>
5053
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColorRow">
5154
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
5255
</actionGroup>

0 commit comments

Comments
 (0)