Skip to content

Commit d1c6e42

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Fixed Mftf tests
1 parent 4766efe commit d1c6e42

File tree

10 files changed

+39
-32
lines changed

10 files changed

+39
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<argument name="expectedPaddingBottom" defaultValue="1"/>
1717
<argument name="expectedBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1818
</arguments>
19-
<executeJS function="{{PageBuilderStage.computedHeightOnStage(contentType.role,index)}}" stepKey="actualStageContentTypeHeight"/>
20-
<executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}}+({{expectedBorderWidth.value}}*2))" stepKey="expectedContentTypeHeightWithPadding"/>
19+
<executeJS function="{{PageBuilderStage.computedHeightOnStage(contentType.role,index)}}+({{expectedBorderWidth.value}}*2)" stepKey="actualStageContentTypeHeight"/>
20+
<executeJS function="return Math.round({{containerDefaultHeight.value}}+{{expectedPaddingTop.paddingTop}}+{{expectedPaddingBottom.paddingBottom}})" stepKey="expectedContentTypeHeightWithPadding"/>
2121
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
2222
<expectedResult type="variable">actualStageContentTypeHeight</expectedResult>
2323
<actualResult type="variable">expectedContentTypeHeightWithPadding</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,11 @@
109109
</actionGroup>
110110
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefront"/>
111111
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront"/>
112-
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront">
113-
<expectedResult type="variable">$columnWidthStorefront</expectedResult>
114-
<actualResult type="variable">$buttonWidthStorefront</actualResult>
115-
</assertLessThan>
112+
<executeJS function="return Math.abs({$columnWidthStorefront}-{$buttonWidthStorefront})" stepKey="buttonWidthStorefrontDifference"/>
113+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefront">
114+
<expectedResult type="int">1</expectedResult>
115+
<actualResult type="variable">$buttonWidthStorefrontDifference</actualResult>
116+
</assertLessThanOrEqual>
116117
<!-- Validate Storefront Mobile: Initial -->
117118
<comment userInput="Validate Storefront Mobile: Initial" stepKey="commentValidateStorefrontMobile1"/>
118119
<resizeWindow width="375" height="667" stepKey="resizeWindowToMobile1"/>
@@ -122,10 +123,11 @@
122123
</actionGroup>
123124
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefrontMobile"/>
124125
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile"/>
125-
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile">
126-
<expectedResult type="variable">$columnWidthStorefrontMobile</expectedResult>
127-
<actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
128-
</assertLessThan>
126+
<executeJS function="return Math.abs({$columnWidthStorefrontMobile}-{$buttonWidthStorefrontMobile})" stepKey="buttonWidthMobileDifference"/>
127+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile">
128+
<expectedResult type="int">1</expectedResult>
129+
<actualResult type="variable">$buttonWidthMobileDifference</actualResult>
130+
</assertLessThanOrEqual>
129131
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
130132
<!-- Resize Column: Large -->
131133
<comment userInput="Resize Column: Large" stepKey="commentResize1"/>
@@ -181,10 +183,11 @@
181183
</actionGroup>
182184
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('1')}}')).width)" stepKey="columnWidthStorefrontMobile2"/>
183185
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile2"/>
184-
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile2">
185-
<expectedResult type="variable">$columnWidthStorefrontMobile2</expectedResult>
186-
<actualResult type="variable">$buttonWidthStorefrontMobile2</actualResult>
187-
</assertLessThan>
186+
<executeJS function="return Math.abs({$columnWidthStorefrontMobile2}-{$buttonWidthStorefrontMobile2})" stepKey="buttonWidthMobileDifference2"/>
187+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile2">
188+
<expectedResult type="int">1</expectedResult>
189+
<actualResult type="variable">$buttonWidthMobileDifference2</actualResult>
190+
</assertLessThanOrEqual>
188191
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop2"/>
189192
<!-- Move Buttons to Small Column -->
190193
<comment userInput="Move Buttons to Small Column" stepKey="moveButtons"/>
@@ -222,10 +225,11 @@
222225
</actionGroup>
223226
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefront3"/>
224227
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefront3"/>
225-
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefront3">
226-
<expectedResult type="variable">$columnWidthStorefront3</expectedResult>
227-
<actualResult type="variable">$buttonWidthStorefront3</actualResult>
228-
</assertLessThan>
228+
<executeJS function="return Math.abs({$columnWidthStorefront3}-{$buttonWidthStorefront3})" stepKey="buttonWidthStorefrontDifference3"/>
229+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefront3">
230+
<expectedResult type="int">1</expectedResult>
231+
<actualResult type="variable">$buttonWidthStorefrontDifference3</actualResult>
232+
</assertLessThanOrEqual>
229233
<!-- Validate Storefront Mobile: Small Column -->
230234
<comment userInput="Validate Storefront Mobile: Small Column" stepKey="commentValidateStorefrontMobile3"/>
231235
<resizeWindow width="375" height="667" stepKey="resizeWindowToMobile3"/>
@@ -235,10 +239,11 @@
235239
</actionGroup>
236240
<executeJS function="return parseInt(window.getComputedStyle(document.querySelector('{{ColumnOnFrontend.columnX('2')}}')).width)" stepKey="columnWidthStorefrontMobile3"/>
237241
<executeJS function="return parseInt(window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).width)" stepKey="buttonWidthStorefrontMobile3"/>
238-
<assertLessThan stepKey="assertButtonSmallerThanColumnStorefrontMobile3">
239-
<expectedResult type="variable">$columnWidthStorefrontMobile3</expectedResult>
240-
<actualResult type="variable">$buttonWidthStorefrontMobile3</actualResult>
241-
</assertLessThan>
242+
<executeJS function="return Math.abs({$columnWidthStorefrontMobile3}-{$buttonWidthStorefrontMobile3})" stepKey="buttonWidthMobileDifference3"/>
243+
<assertLessThanOrEqual stepKey="assertButtonSmallerThanColumnStorefrontMobile3">
244+
<expectedResult type="int">1</expectedResult>
245+
<actualResult type="variable">$buttonWidthMobileDifference3</actualResult>
246+
</assertLessThanOrEqual>
242247
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop3"/>
243248
</test>
244249
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2929
<argument name="element" value="SlideOnBackend"/>
3030
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
31+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
3232
<argument name="diffThreshold" value="2"/>
3333
</actionGroup>
3434
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3535
<argument name="column" value="ColumnOnFrontend"/>
3636
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3737
<argument name="element" value="SlideOnFrontend"/>
3838
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
39+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
4040
<argument name="diffThreshold" value="0"/>
4141
</actionGroup>
4242
</test>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2929
<argument name="element" value="SlideOnBackend"/>
3030
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
31+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
3232
<argument name="diffThreshold" value="2"/>
3333
</actionGroup>
3434
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3535
<argument name="column" value="ColumnOnFrontend"/>
3636
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3737
<argument name="element" value="SlideOnFrontend"/>
3838
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
39+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
4040
<argument name="diffThreshold" value="0"/>
4141
</actionGroup>
4242
</test>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
2929
<argument name="element" value="SlideOnBackend"/>
3030
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
31-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
31+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
3232
<argument name="diffThreshold" value="2"/>
3333
</actionGroup>
3434
<actionGroup ref="validateOverlayAndButtonCollage" stepKey="validateSlideOnStorefront">
3535
<argument name="column" value="ColumnOnFrontend"/>
3636
<argument name="columnPadding" value="PageBuilderPaddingProperty10"/>
3737
<argument name="element" value="SlideOnFrontend"/>
3838
<argument name="elementBorderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
39-
<argument name="overlayPadding" value="PageBuilderPaddingProperty40"/>
39+
<argument name="elementPadding" value="PageBuilderPaddingProperty40"/>
4040
<argument name="diffThreshold" value="0"/>
4141
</actionGroup>
4242
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsAdvancedSettingsApplyInAdminPreviewAndStorefrontTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
8181
<argument name="borderRadius" value="PageBuilderTabHeaderAdvancedBorderRadiusProperty12"/>
8282
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesDefaultProperty"/>
83+
<argument name="margin" value="PageBuilderTabMarginsPropertyBorderWidth10"/>
8384
</actionGroup>
8485
<actionGroup ref="ValidateAdvancedConfigurationAllOptionsActionGroup" stepKey="seeTabsContentAdvancedStylesInAdminPreview">
8586
<argument name="page" value="TabsOnStage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<comment userInput="User sees tabs border settings to be default as documented (defined by the theme style)" stepKey="AC10"/>
9696
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTab1BorderWidth">
9797
<argument name="selector" value="{{TabOnStage.tabContent('1')}}"/>
98-
<argument name="expectedProperty" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
98+
<argument name="expectedProperty" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
9999
<argument name="cssProperty" value="borderWidth"/>
100100
</actionGroup>
101101
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTab1BorderRadius">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyRight"/>
171171
<argument name="border" value="PageBuilderAdvancedBorderPropertyDotted"/>
172172
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_FF0000"/>
173+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
173174
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyOneClass"/>
174175
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
175176
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
</actionGroup>
167167
<executeJS function="return {{BannerOnBackend.overlayJS('1')}}.getBoundingClientRect().left" stepKey="overlayLeftPositionCMSBlockStage"/>
168168
<executeJS function="return document.evaluate(&quot;{{BannerOnBackend.button('1')}}&quot;, document.body).iterateNext().getBoundingClientRect().left" stepKey="buttonLeftPositionCMSBlockStage"/>
169-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-{{PageBuilderPaddingProperty40.paddingLeft}}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
169+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
170170
<assertLessThanOrEqual stepKey="assertButtonLeftAlignedCMSBlockStage">
171171
<expectedResult type="int">5</expectedResult>
172172
<actualResult type="variable">buttonMinusOverlayMinusPaddingCMSBlockStage</actualResult>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStageMobile">
186186
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
187187
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
188-
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
188+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
189189
<argument name="index" value="1"/>
190190
</actionGroup>
191191
<seeElement selector="{{DividerOnStage.base('1')}}" stepKey="seeDividerCMSBlockStageMobile"/>
@@ -257,7 +257,7 @@
257257
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStage">
258258
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
259259
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
260-
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
260+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
261261
<argument name="index" value="1"/>
262262
</actionGroup>
263263
<seeElement selector="{{DividerOnStage.base('1')}}" stepKey="seeDividerCMSBlockStage"/>

0 commit comments

Comments
 (0)