Skip to content

Commit 0189eff

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#637: Form field/field group viewport scope - applied requested changes
1 parent c3645fd commit 0189eff

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerMinHeightTest.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
<argument name="contentType" value="PageBuilderBannerContentType"/>
3030
<argument name="index" value="1"/>
3131
</actionGroup>
32-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="removeBannerDefaultMinHeight" before="enterPadding">
33-
<argument name="property" value="PageBuilderMinHeightProperty_Empty"/>
34-
</actionGroup>
35-
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
36-
<argument name="property" value="PageBuilderPaddingProperty40"/>
37-
</actionGroup>
3832

3933
<!-- Duplicate Banner Content Type -->
4034
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType1">
@@ -73,6 +67,9 @@
7367
<argument name="contentType" value="PageBuilderBannerContentType"/>
7468
<argument name="contentTypeIndex" value="3"/>
7569
</actionGroup>
70+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterEmptyMinHeightValue" before="validateEmptyHeightField2">
71+
<argument name="property" value="PageBuilderMinHeightProperty_Empty"/>
72+
</actionGroup>
7673
<!-- Banner 3: Mobile Min Height = 200px -->
7774
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel6">
7875
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -102,7 +99,7 @@
10299
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSBlockStageDesktop"/>
103100
<assertEquals stepKey="assertThirdMinHeightCMSBlockStageDesktop">
104101
<actualResult type="variable">thirdMinHeightCMSBlockStageDesktop</actualResult>
105-
<expectedResult type="string">130</expectedResult>
102+
<expectedResult type="string">50</expectedResult>
106103
</assertEquals>
107104

108105
<!-- Validate CMS Block Stage Mobile Viewport -->
@@ -150,7 +147,7 @@
150147
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSPageStageDesktop"/>
151148
<assertEquals stepKey="assertThirdMinHeightCMSPageStageDesktop">
152149
<actualResult type="variable">thirdMinHeightCMSPageStageDesktop</actualResult>
153-
<expectedResult type="string">130</expectedResult>
150+
<expectedResult type="string">50</expectedResult>
154151
</assertEquals>
155152

156153
<!-- Validate CMS Page Stage Mobile Viewport -->
@@ -198,7 +195,7 @@
198195
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightStorefront"/>
199196
<assertEquals stepKey="assertThirdMinHeightStorefront">
200197
<actualResult type="variable">thirdMinHeightCMSPageStageDesktop</actualResult>
201-
<expectedResult type="string">130</expectedResult>
198+
<expectedResult type="string">50</expectedResult>
202199
</assertEquals>
203200

204201
<!-- Validate Storefront Mobile -->

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
<argument name="viewportButton" value="desktop"/>
140140
<argument name="viewportStage" value="desktop"/>
141141
</actionGroup>
142-
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSBlockStage"/>
143142
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSBlockStageDesktop">
144143
<argument name="selector" value="{{RowOnStage.base('1')}}"/>
145144
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
@@ -233,7 +232,6 @@
233232
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
234233

235234
<!-- Validate CMS Page Stage Desktop Viewport -->
236-
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSPageStageDesktop"/>
237235
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStageDesktop">
238236
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
239237
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
@@ -311,7 +309,6 @@
311309
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
312310
<argument name="page" value="$$createCMSPage.identifier$$"/>
313311
</actionGroup>
314-
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
315312
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
316313
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
317314
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>

0 commit comments

Comments
 (0)