Skip to content

Commit ce9078e

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#637: Form field/field group viewport scope - apply requested changes
1 parent 9a7e413 commit ce9078e

File tree

3 files changed

+62
-62
lines changed

3 files changed

+62
-62
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,23 @@
8282
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
8383
<argument name="cssProperty" value="minHeight"/>
8484
</actionGroup>
85-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStageDesktop"/>
85+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightCMSBlockStageDesktop"/>
8686

8787
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightCMSBlockStageDesktop">
8888
<argument name="selector" value="{{BannerOnBackend.overlay('2')}}"/>
8989
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
9090
<argument name="cssProperty" value="minHeight"/>
9191
</actionGroup>
92-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightCMSBlockStageDesktop"/>
92+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightCMSBlockStageDesktop"/>
9393

9494
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeThirdMinHeightCMSBlockStageDesktop">
9595
<argument name="selector" value="{{BannerOnBackend.overlay('3')}}"/>
9696
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
9797
<argument name="cssProperty" value="minHeight"/>
9898
</actionGroup>
99-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSBlockStageDesktop"/>
100-
<assertEquals stepKey="assertThirdMinHeightCMSBlockStageDesktop">
101-
<actualResult type="variable">thirdMinHeightCMSBlockStageDesktop</actualResult>
99+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightCMSBlockStageDesktop"/>
100+
<assertEquals stepKey="assertThirdHeightEqualsMinHeightCMSBlockStageDesktop">
101+
<actualResult type="variable">thirdActualHeightCMSBlockStageDesktop</actualResult>
102102
<expectedResult type="string">50</expectedResult>
103103
</assertEquals>
104104

@@ -108,9 +108,9 @@
108108
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
109109
<argument name="cssProperty" value="minHeight"/>
110110
</actionGroup>
111-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStageMobile"/>
111+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightCMSBlockStageMobile"/>
112112

113-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightCMSBlockStageMobile"/>
113+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightCMSBlockStageMobile"/>
114114
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightCMSBlockStageMobile">
115115
<argument name="selector" value="{{BannerOnBackend.overlay('2')}}"/>
116116
<argument name="expectedProperty" value="$expectedSecondHeightCMSBlockStageMobile"/>
@@ -122,31 +122,31 @@
122122
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
123123
<argument name="cssProperty" value="minHeight"/>
124124
</actionGroup>
125-
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSBlockStageMobile"/>
125+
<executeJS function="return document.evaluate('{{BannerOnBackend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightCMSBlockStageMobile"/>
126126

127127
<!-- Validate CMS Page Stage Desktop Viewport -->
128128
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStageDesktop">
129129
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
130130
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
131131
<argument name="cssProperty" value="minHeight"/>
132132
</actionGroup>
133-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStageDesktop"/>
133+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightCMSPageStageDesktop"/>
134134

135135
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightCMSPageStageDesktop">
136136
<argument name="selector" value="{{BannerOnFrontend.overlay('2')}}"/>
137137
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
138138
<argument name="cssProperty" value="minHeight"/>
139139
</actionGroup>
140-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightCMSPageStageDesktop"/>
140+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightCMSPageStageDesktop"/>
141141

142142
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeThirdMinHeightCMSPageStageDesktop">
143143
<argument name="selector" value="{{BannerOnFrontend.overlay('3')}}"/>
144144
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
145145
<argument name="cssProperty" value="minHeight"/>
146146
</actionGroup>
147-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSPageStageDesktop"/>
148-
<assertEquals stepKey="assertThirdMinHeightCMSPageStageDesktop">
149-
<actualResult type="variable">thirdMinHeightCMSPageStageDesktop</actualResult>
147+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightCMSPageStageDesktop"/>
148+
<assertEquals stepKey="assertThirdHeightEqualsMinHeightCMSPageStageDesktop">
149+
<actualResult type="variable">thirdActualHeightCMSPageStageDesktop</actualResult>
150150
<expectedResult type="string">50</expectedResult>
151151
</assertEquals>
152152

@@ -156,9 +156,9 @@
156156
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
157157
<argument name="cssProperty" value="minHeight"/>
158158
</actionGroup>
159-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStageMobile"/>
159+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightCMSPageStageMobile"/>
160160

161-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightCMSPageStageMobile"/>
161+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightCMSPageStageMobile"/>
162162
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightCMSPageStageMobile">
163163
<argument name="selector" value="{{BannerOnFrontend.overlay('2')}}"/>
164164
<argument name="expectedProperty" value="$expectedSecondHeightCMSPageStageMobile"/>
@@ -170,31 +170,31 @@
170170
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
171171
<argument name="cssProperty" value="minHeight"/>
172172
</actionGroup>
173-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightCMSPageStageMobile"/>
173+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightCMSPageStageMobile"/>
174174

175175
<!-- Validate Storefront Desktop -->
176176
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
177177
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
178178
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
179179
<argument name="cssProperty" value="minHeight"/>
180180
</actionGroup>
181-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>
181+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightStorefront"/>
182182

183183
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightStorefront">
184184
<argument name="selector" value="{{BannerOnFrontend.overlay('2')}}"/>
185185
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
186186
<argument name="cssProperty" value="minHeight"/>
187187
</actionGroup>
188-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightStorefront"/>
188+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightStorefront"/>
189189

190190
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeThirdMinHeightStorefront">
191191
<argument name="selector" value="{{BannerOnFrontend.overlay('3')}}"/>
192192
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
193193
<argument name="cssProperty" value="minHeight"/>
194194
</actionGroup>
195-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightStorefront"/>
196-
<assertEquals stepKey="assertThirdMinHeightStorefront">
197-
<actualResult type="variable">thirdMinHeightCMSPageStageDesktop</actualResult>
195+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightStorefront"/>
196+
<assertEquals stepKey="assertThirdHeightEqualsMinHeightStorefront">
197+
<actualResult type="variable">thirdActualHeightStorefront</actualResult>
198198
<expectedResult type="string">50</expectedResult>
199199
</assertEquals>
200200

@@ -204,9 +204,9 @@
204204
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
205205
<argument name="cssProperty" value="minHeight"/>
206206
</actionGroup>
207-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefrontMobile"/>
207+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstActualHeightStorefrontMobile"/>
208208

209-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondMinHeightStorefrontMobile"/>
209+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="secondActualHeightStorefrontMobile"/>
210210
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeSecondMinHeightStorefrontMobile">
211211
<argument name="selector" value="{{BannerOnFrontend.overlay('2')}}"/>
212212
<argument name="expectedProperty" value="$expectedSecondHeightStorefrontMobile"/>
@@ -218,6 +218,6 @@
218218
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
219219
<argument name="cssProperty" value="minHeight"/>
220220
</actionGroup>
221-
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdMinHeightStorefrontMobile"/>
221+
<executeJS function="return document.evaluate('{{BannerOnFrontend.overlay('3')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="thirdActualHeightStorefrontMobile"/>
222222
</test>
223223
</tests>

0 commit comments

Comments
 (0)