Skip to content

Commit d315749

Browse files
committed
MC-2362: Create MFTF Tests
- Update appearance entity name to layout since field was moved - Update no required test to check other non background fields
1 parent b718843 commit d315749

File tree

4 files changed

+39
-36
lines changed

4 files changed

+39
-36
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@
5252
<data key="value">190</data>
5353
<data key="valueWithPadding">210</data>
5454
</entity>
55-
<entity name="PageBuilderAppearanceMinHeightProperty" type="pagebuilder_column_min_height_property">
55+
<entity name="PageBuilderLayoutMinHeightProperty" type="pagebuilder_column_min_height_property">
5656
<data key="name">Minimum Height</data>
5757
<data key="section">layout</data>
5858
<data key="fieldName">min_height</data>
5959
<data key="value">500</data>
6060
</entity>
61-
<entity name="PageBuilderAppearanceMinHeightProperty_300" type="pagebuilder_column_min_height_property">
61+
<entity name="PageBuilderLayoutMinHeightProperty_300" type="pagebuilder_column_min_height_property">
6262
<data key="name">Minimum Height</data>
6363
<data key="section">layout</data>
6464
<data key="fieldName">min_height</data>
6565
<data key="value">300</data>
6666
</entity>
67-
<entity name="PageBuilderAppearanceMinHeightProperty_200" type="pagebuilder_column_min_height_property">
67+
<entity name="PageBuilderLayoutMinHeightProperty_200" type="pagebuilder_column_min_height_property">
6868
<data key="name">Minimum Height</data>
6969
<data key="section">layout</data>
7070
<data key="fieldName">min_height</data>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484
<argument name="contentType" value="PageBuilderColumnContentType"/>
8585
</actionGroup>
8686
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
87-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
87+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
8888
</actionGroup>
8989
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
9090
<comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
9191
<actionGroup ref="validateContentTypeHeightOnStage" stepKey="assertInitialColumnHeightMatchesExpected">
9292
<argument name="contentType" value="PageBuilderColumnContentType"/>
9393
<argument name="index" value="1"/>
94-
<argument name="containerDefaultHeight" value="PageBuilderAppearanceMinHeightProperty"/>
94+
<argument name="containerDefaultHeight" value="PageBuilderLayoutMinHeightProperty"/>
9595
<argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
9696
<argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
9797
</actionGroup>
@@ -153,12 +153,12 @@
153153
<argument name="contentType" value="PageBuilderColumnContentType"/>
154154
</actionGroup>
155155
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
156-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_200"/>
156+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_200"/>
157157
</actionGroup>
158158
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
159159
<comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
160160
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageContentTypeHeight"/>
161-
<executeJS function="return Math.round({{PageBuilderAppearanceMinHeightProperty_200.value}} + {{PageBuilderPaddingProperty10.paddingTop}} + {{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedColumnHeight"/>
161+
<executeJS function="return Math.round({{PageBuilderLayoutMinHeightProperty_200.value}} + {{PageBuilderPaddingProperty10.paddingTop}} + {{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedColumnHeight"/>
162162
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
163163
<expectedResult type="variable">actualStageContentTypeHeight</expectedResult>
164164
<actualResult type="variable">expectedColumnHeight</actualResult>
@@ -521,7 +521,7 @@
521521
</test>
522522
<test name="ColumnValidateBackgroundSectionDefaultValues">
523523
<annotations>
524-
<features value="Pagebuilder"/>
524+
<features value="PageBuilder"/>
525525
<stories value="Column"/>
526526
<title value="Validate Background Section Default Values in Column"/>
527527
<description value="Validate the default values for every attribute in the Background section for Column. Validate Stage and Storefront as well."/>
@@ -616,8 +616,6 @@
616616
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment2">
617617
<argument name="property" value="PageBuilderBackgroundAttachment_Default"/>
618618
</actionGroup>
619-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
620-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
621619
<!-- Validate Storefront -->
622620
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
623621
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

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

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
101101
</actionGroup>
102102
</test>
103-
<test name="ColumnNoBackgroundRequired">
103+
<test name="ColumnNoRequired">
104104
<annotations>
105105
<features value="PageBuilder"/>
106106
<stories value="Column"/>
@@ -123,12 +123,11 @@
123123
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
124124
<argument name="contentType" value="PageBuilderColumnContentType"/>
125125
</actionGroup>
126-
<seeNumberOfElements selector="{{ColumnOnBackend.columnGroupColumns('1')}}" userInput="2" stepKey="seeElementColumn"/>
127126
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel">
128127
<argument name="contentType" value="PageBuilderColumnContentType"/>
129128
</actionGroup>
130129
<actionGroup ref="validateSlideOutPanelField" stepKey="seeAppearanceMinHeightProperty">
131-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
130+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
132131
</actionGroup>
133132
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
134133
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -149,7 +148,7 @@
149148
<argument name="property" value="PageBuilderBackgroundAttachmentProperty"/>
150149
</actionGroup>
151150
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeColumnMinHeightNotRequired">
152-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
151+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
153152
</actionGroup>
154153
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
155154
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -169,6 +168,12 @@
169168
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundAttachmentNotRequired">
170169
<argument name="property" value="PageBuilderBackgroundAttachmentProperty"/>
171170
</actionGroup>
171+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeMinHeightNotRequired">
172+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
173+
</actionGroup>
174+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeVerticalAlignmentNotRequired">
175+
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
176+
</actionGroup>
172177
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
173178
<waitForElementVisible selector="{{ColumnOnBackend.base('1')}}" stepKey="waitForColumnOnStage" />
174179
</test>
@@ -248,7 +253,7 @@
248253
<argument name="contentTypeIndex" value="1"/>
249254
</actionGroup>
250255
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty">
251-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_300"/>
256+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_300"/>
252257
</actionGroup>
253258
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopProperty">
254259
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
@@ -357,7 +362,7 @@
357362
<argument name="property" value="PageBuilderColumnAppearanceProperty_Top"/>
358363
</actionGroup>
359364
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty500">
360-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
365+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
361366
</actionGroup>
362367
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopProperty">
363368
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
@@ -382,7 +387,7 @@
382387
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
383388
</actionGroup>
384389
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty300">
385-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_300"/>
390+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_300"/>
386391
</actionGroup>
387392
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmenCenterProperty">
388393
<argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
@@ -407,7 +412,7 @@
407412
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
408413
</actionGroup>
409414
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty200">
410-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_200"/>
415+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_200"/>
411416
</actionGroup>
412417
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmenBottomProperty">
413418
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
@@ -571,7 +576,7 @@
571576
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
572577
</actionGroup>
573578
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
574-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
579+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
575580
</actionGroup>
576581
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
577582
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -631,7 +636,7 @@
631636
<argument name="contentType" value="PageBuilderColumnContentType"/>
632637
</actionGroup>
633638
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
634-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
639+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
635640
</actionGroup>
636641
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
637642
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -660,7 +665,7 @@
660665
<argument name="contentTypeIndex" value="2"/>
661666
</actionGroup>
662667
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
663-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
668+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
664669
</actionGroup>
665670
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
666671
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
@@ -723,7 +728,7 @@
723728
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
724729
</actionGroup>
725730
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
726-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
731+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
727732
</actionGroup>
728733
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
729734
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForSecondColumn">
@@ -734,15 +739,15 @@
734739
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
735740
</actionGroup>
736741
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
737-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
742+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
738743
</actionGroup>
739744
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
740745
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForThirdColumn">
741746
<argument name="contentType" value="PageBuilderColumnContentType"/>
742747
<argument name="contentTypeIndex" value="3"/>
743748
</actionGroup>
744749
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty3">
745-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
750+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
746751
</actionGroup>
747752
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
748753
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
@@ -790,7 +795,7 @@
790795
<argument name="contentType" value="PageBuilderColumnContentType"/>
791796
</actionGroup>
792797
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
793-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
798+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
794799
</actionGroup>
795800
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
796801
<argument name="property" value="PageBuilderBackgroundColorProperty_087E8B"/>
@@ -817,8 +822,8 @@
817822
<argument name="contentType" value="PageBuilderColumnContentType"/>
818823
<argument name="contentTypeIndex" value="2"/>
819824
</actionGroup>
820-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="PageBuilderAppearanceMinHeightProperty">
821-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
825+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="PageBuilderLayoutMinHeightProperty">
826+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
822827
</actionGroup>
823828
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeBackgroundColorProperty">
824829
<argument name="property" value="PageBuilderBackgroundColorProperty_087E8B"/>
@@ -863,7 +868,7 @@
863868
<argument name="contentType" value="PageBuilderColumnContentType"/>
864869
</actionGroup>
865870
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
866-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
871+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
867872
</actionGroup>
868873
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
869874
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
@@ -898,7 +903,7 @@
898903
<argument name="contentType" value="PageBuilderColumnContentType"/>
899904
</actionGroup>
900905
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
901-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
906+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
902907
</actionGroup>
903908
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
904909
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
@@ -952,7 +957,7 @@
952957
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
953958
</actionGroup>
954959
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
955-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
960+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
956961
</actionGroup>
957962
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty1">
958963
<argument name="property" value="PageBuilderBackgroundColorProperty_087E8B"/>
@@ -966,7 +971,7 @@
966971
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
967972
</actionGroup>
968973
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
969-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_300"/>
974+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_300"/>
970975
</actionGroup>
971976
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty2">
972977
<argument name="property" value="PageBuilderBackgroundColorProperty_FF5A5F"/>
@@ -977,7 +982,7 @@
977982
<argument name="contentTypeIndex" value="3"/>
978983
</actionGroup>
979984
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty3">
980-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_200"/>
985+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_200"/>
981986
</actionGroup>
982987
<comment userInput="I fill out color into Background Color using Color Picker" stepKey="comment"/>
983988
<actionGroup ref="fillOutColorPicker" stepKey="fillOutColor">
@@ -1009,8 +1014,8 @@
10091014
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seePageBuilderAppearanceProperty">
10101015
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
10111016
</actionGroup>
1012-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seePageBuilderAppearanceMinHeightProperty">
1013-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_300"/>
1017+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seePageBuilderLayoutMinHeightProperty">
1018+
<argument name="property" value="PageBuilderLayoutMinHeightProperty_300"/>
10141019
</actionGroup>
10151020
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeBackgroundColorProperty">
10161021
<argument name="property" value="PageBuilderBackgroundColorProperty_FF5A5F"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabContentTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
<argument name="contentType" value="PageBuilderColumnContentType"/>
583583
</actionGroup>
584584
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
585-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
585+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
586586
</actionGroup>
587587
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
588588
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -593,7 +593,7 @@
593593
<argument name="contentTypeIndex" value="2"/>
594594
</actionGroup>
595595
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
596-
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
596+
<argument name="property" value="PageBuilderLayoutMinHeightProperty"/>
597597
</actionGroup>
598598
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
599599
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>

0 commit comments

Comments
 (0)