Skip to content

Commit 4031f50

Browse files
anthoulaanthoula
committed
MC-2365: Create MFTF tests for vertical alignment of rows
- move style string to data
1 parent 2ede37a commit 4031f50

File tree

3 files changed

+39
-42
lines changed

3 files changed

+39
-42
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,22 @@
4343
<data key="fieldName">justify_content</data>
4444
<data key="value">flex-start</data>
4545
<data key="optionsList">[Top, Center, Bottom]</data>
46+
<data key="style">justify-content: flex-start</data>
4647
</entity>
4748
<entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
4849
<data key="name">Vertical alignment</data>
4950
<data key="section">layout</data>
5051
<data key="fieldName">justify_content</data>
5152
<data key="value">center</data>
5253
<data key="optionsList">[Top, Center, Bottom]</data>
54+
<data key="style">justify-content: center</data>
5355
</entity>
5456
<entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
5557
<data key="name">Vertical alignment</data>
5658
<data key="section">layout</data>
5759
<data key="fieldName">justify_content</data>
5860
<data key="value">flex-end</data>
5961
<data key="optionsList">[Top, Center, Bottom]</data>
60-
</entity>
61-
<!-- Styles -->
62-
<entity name="PageBuilderCommonStyles" type="pagebuilder_common_styles">
63-
<data key="verticalAlignmentBottom">justify-content: flex-end</data>
64-
<data key="verticalAlignmentCenter">justify-content: center</data>
65-
<data key="verticalAlignmentTop">justify-content: flex-start</data>
62+
<data key="style">justify-content: flex-end</data>
6663
</entity>
6764
</entities>

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -289,23 +289,23 @@
289289
</actionGroup>
290290
<!-- Verify Vertical Alignment On Stage - Before Save -->
291291
<comment userInput="Verify vertical alignment on stage before save" stepKey="commentVerifyVerticalAlignmentOnStageBeforeSave"/>
292-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstColumnVerticalAlignmentTop"/>
293-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeFirstColumnVerticalAlignmentCenter"/>
294-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeFirstColumnVerticalAlignmentBottom"/>
292+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstColumnVerticalAlignmentTop"/>
293+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeFirstColumnVerticalAlignmentCenter"/>
294+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeFirstColumnVerticalAlignmentBottom"/>
295295
<!-- Verify Vertical Alignment On Stage - After Save -->
296296
<comment userInput="Verify vertical alignment on stage after save" stepKey="commentVerifyVerticalAlignmentOnStageAfterSave"/>
297297
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
298298
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
299-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstColumnVerticalAlignmentTopAfterSave"/>
300-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeFirstColumnVerticalAlignmentCenterAfterSave"/>
301-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeFirstColumnVerticalAlignmentBottomAfterSave"/>
299+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstColumnVerticalAlignmentTopAfterSave"/>
300+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeFirstColumnVerticalAlignmentCenterAfterSave"/>
301+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeFirstColumnVerticalAlignmentBottomAfterSave"/>
302302
<!-- Verify Vertical Alignment In Storefront -->
303303
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
304304
<argument name="contentType" value="PageBuilderColumnContentType"/>
305305
</actionGroup>
306-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeColumn1VerticalAlignmentTopApplied"/>
307-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeColumn2VerticalAlignmentCenterApplied"/>
308-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeColumn2VerticalAlignmentBottomApplied"/>
306+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeColumn1VerticalAlignmentTopApplied"/>
307+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeColumn2VerticalAlignmentCenterApplied"/>
308+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeColumn2VerticalAlignmentBottomApplied"/>
309309
</test>
310310
<test name="ColumnContentIsVerticallyAlignedWithAppearanceAndDifferentMinimumHeights">
311311
<annotations>
@@ -410,24 +410,24 @@
410410
</actionGroup>
411411
<!-- Verify Vertical Alignment On Stage - Before Save -->
412412
<comment userInput="Verify vertical alignment on stage before save" stepKey="commentVerifyVerticalAlignmentOnStageBeforeSave"/>
413-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstColumnVerticalAlignmentTop"/>
414-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeFirstColumnVerticalAlignmentCenter"/>
415-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeFirstColumnVerticalAlignmentBottom"/>
413+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstColumnVerticalAlignmentTop"/>
414+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeFirstColumnVerticalAlignmentCenter"/>
415+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeFirstColumnVerticalAlignmentBottom"/>
416416
<!-- Verify Vertical Alignment On Stage - After Save -->
417417
<comment userInput="Verify vertical alignment on stage after save" stepKey="commentVerifyVerticalAlignmentOnStageAfterSave"/>
418418
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
419419
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
420-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstColumnVerticalAlignmentTopAfterSave"/>
421-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeFirstColumnVerticalAlignmentCenterAfterSave"/>
422-
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeFirstColumnVerticalAlignmentBottomAfterSave"/>
420+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstColumnVerticalAlignmentTopAfterSave"/>
421+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeFirstColumnVerticalAlignmentCenterAfterSave"/>
422+
<seeElement selector="{{PageBuilderColumnSection.columnChildrenStyle('1', '3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeFirstColumnVerticalAlignmentBottomAfterSave"/>
423423
<!-- Verify Vertical Alignment In Storefront -->
424424
<comment userInput="Verify vertical alignment in storefront" stepKey="commentVerifyVerticalAlignmentInStorefront"/>
425425
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
426426
<argument name="contentType" value="PageBuilderColumnContentType"/>
427427
</actionGroup>
428-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeColumn1VerticalAlignmentTopApplied"/>
429-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeColumn2VerticalAlignmentCenterApplied"/>
430-
<seeElement selector="{{ColumnsOnFrontend.columnStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeColumn2VerticalAlignmentBottomApplied"/>
428+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeColumn1VerticalAlignmentTopApplied"/>
429+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeColumn2VerticalAlignmentCenterApplied"/>
430+
<seeElement selector="{{ColumnsOnFrontend.columnStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeColumn2VerticalAlignmentBottomApplied"/>
431431
</test>
432432
<test name="ColumnPlaceholderInAdminPreview">
433433
<annotations>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -137,23 +137,23 @@
137137
</actionGroup>
138138
<!-- Verify Vertical Alignment On Stage - Before Save -->
139139
<comment userInput="Verify vertical alignment on stage before save" stepKey="commentVerifyVerticalAlignmentOnStageBeforeSave"/>
140-
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstRowVerticalAlignmentTop"/>
141-
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeSecondRowVerticalAlignmentCenter"/>
142-
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeThirdRowVerticalAlignmentBottom"/>
140+
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstRowVerticalAlignmentTop"/>
141+
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeSecondRowVerticalAlignmentCenter"/>
142+
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeThirdRowVerticalAlignmentBottom"/>
143143
<!-- Verify Vertical Alignment On Stage - After Save -->
144144
<comment userInput="Verify vertical alignment on stage after save" stepKey="commentVerifyVerticalAlignmentOnStageAfterSave"/>
145145
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
146146
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
147-
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstRowVerticalAlignmentTopAfterSave"/>
148-
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeSecondRowVerticalAlignmentCenterAfterSave"/>
149-
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeThirdRowVerticalAlignmentBottomAfterSave"/>
147+
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstRowVerticalAlignmentTopAfterSave"/>
148+
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeSecondRowVerticalAlignmentCenterAfterSave"/>
149+
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeThirdRowVerticalAlignmentBottomAfterSave"/>
150150
<!-- Verify Vertical Alignment In Storefront -->
151151
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
152152
<argument name="contentType" value="PageBuilderRowContentType"/>
153153
</actionGroup>
154-
<seeElement selector="{{RowOnStorefront.rowStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeRow1VerticalAlignmentTopApplied"/>
155-
<seeElement selector="{{RowOnStorefront.rowStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeRow2VerticalAlignmentCenterApplied"/>
156-
<seeElement selector="{{RowOnStorefront.rowStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeRow3VerticalAlignmentBottomApplied"/>
154+
<seeElement selector="{{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeRow1VerticalAlignmentTopApplied"/>
155+
<seeElement selector="{{RowOnStorefront.rowStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeRow2VerticalAlignmentCenterApplied"/>
156+
<seeElement selector="{{RowOnStorefront.rowStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeRow3VerticalAlignmentBottomApplied"/>
157157
</test>
158158
<test name="RowContentIsVerticallyAlignedWithDifferentMinimumHeights">
159159
<annotations>
@@ -259,19 +259,19 @@
259259
<seeElement selector="{{RowOnStage.minHeight('1', PageBuilderMinHeightProperty_500.value)}}" stepKey="seeFirstRowMinHeight"/>
260260
<seeElement selector="{{RowOnStage.minHeight('2', PageBuilderMinHeightProperty_300.value)}}" stepKey="seeSecondRowMinHeight"/>
261261
<seeElement selector="{{RowOnStage.minHeight('3', PageBuilderMinHeightProperty_200.value)}}" stepKey="seeThirdRowMinHeight"/>
262-
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstRowVerticalAlignmentTop"/>
263-
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeSecondRowVerticalAlignmentCenter"/>
264-
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeThirdRowVerticalAlignmentBottom"/>
262+
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstRowVerticalAlignmentTop"/>
263+
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeSecondRowVerticalAlignmentCenter"/>
264+
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeThirdRowVerticalAlignmentBottom"/>
265265
<!-- Verify Vertical Alignment On Stage - After Save -->
266266
<comment userInput="Verify min height and vertical alignment on stage after save" stepKey="commentVerifyMinHeightAndVerticalAlignmentOnStageAfterSave"/>
267267
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
268268
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
269269
<seeElement selector="{{RowOnStage.minHeight('1', PageBuilderMinHeightProperty_500.value)}}" stepKey="seeFirstRowMinHeightAfterSave"/>
270270
<seeElement selector="{{RowOnStage.minHeight('2', PageBuilderMinHeightProperty_300.value)}}" stepKey="seeSecondRowMinHeightAfterSave"/>
271271
<seeElement selector="{{RowOnStage.minHeight('3', PageBuilderMinHeightProperty_200.value)}}" stepKey="seeThirdRowMinHeightAfterSave"/>
272-
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeFirstRowVerticalAlignmentTopAfterSave"/>
273-
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeSecondRowVerticalAlignmentCenterAfterSave"/>
274-
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeThirdRowVerticalAlignmentBottomAfterSave"/>
272+
<seeElement selector="{{RowOnStage.rowChildrenStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeFirstRowVerticalAlignmentTopAfterSave"/>
273+
<seeElement selector="{{RowOnStage.rowChildrenStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeSecondRowVerticalAlignmentCenterAfterSave"/>
274+
<seeElement selector="{{RowOnStage.rowChildrenStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeThirdRowVerticalAlignmentBottomAfterSave"/>
275275
<!-- Verify Min Height and Vertical Alignment In Storefront -->
276276
<comment userInput="Verify min height and vertical alignment in storefront" stepKey="commentVerifyMinHeightAndVerticalAlignmentInStorefront"/>
277277
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -280,8 +280,8 @@
280280
<seeElement selector="{{RowOnStorefront.rowStyle('1', PageBuilderMinHeightProperty_500.style)}}" stepKey="seeRow1MinHeightApplied"/>
281281
<seeElement selector="{{RowOnStorefront.rowStyle('2', PageBuilderMinHeightProperty_300.style)}}" stepKey="seeRow2MinHeightApplied"/>
282282
<seeElement selector="{{RowOnStorefront.rowStyle('3', PageBuilderMinHeightProperty_200.style)}}" stepKey="seeRow3MinHeightApplied"/>
283-
<seeElement selector="{{RowOnStorefront.rowStyle('1', PageBuilderCommonStyles.verticalAlignmentTop)}}" stepKey="seeRow1VerticalAlignmentTopApplied"/>
284-
<seeElement selector="{{RowOnStorefront.rowStyle('2', PageBuilderCommonStyles.verticalAlignmentCenter)}}" stepKey="seeRow2VerticalAlignmentCenterApplied"/>
285-
<seeElement selector="{{RowOnStorefront.rowStyle('3', PageBuilderCommonStyles.verticalAlignmentBottom)}}" stepKey="seeRow3VerticalAlignmentBottomApplied"/>
283+
<seeElement selector="{{RowOnStorefront.rowStyle('1', PageBuilderVerticalAlignmentPropertyTop.style)}}" stepKey="seeRow1VerticalAlignmentTopApplied"/>
284+
<seeElement selector="{{RowOnStorefront.rowStyle('2', PageBuilderVerticalAlignmentPropertyCenter.style)}}" stepKey="seeRow2VerticalAlignmentCenterApplied"/>
285+
<seeElement selector="{{RowOnStorefront.rowStyle('3', PageBuilderVerticalAlignmentPropertyBottom.style)}}" stepKey="seeRow3VerticalAlignmentBottomApplied"/>
286286
</test>
287287
</tests>

0 commit comments

Comments
 (0)