Skip to content

Commit 60addb7

Browse files
paras89paras89
committed
PB-500 MFTF coverage improvements
1 parent 1d36426 commit 60addb7

File tree

8 files changed

+323
-31
lines changed

8 files changed

+323
-31
lines changed

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@
162162
<data key="value">#ff0000</data>
163163
<data key="rgb">rgb(255, 0, 0)</data>
164164
</entity>
165+
<entity name="PageBuilderAdvancedBorderColorProperty_FB00FF" type="pagebuilder_advanced_border_color_property">
166+
<data key="name">Border Color</data>
167+
<data key="section">advanced</data>
168+
<data key="fieldName">border_color</data>
169+
<data key="value">#fb00ff</data>
170+
<data key="rgb">rgb(251, 0, 255)</data>
171+
</entity>
165172
<entity name="PageBuilderAdvancedBorderColorProperty_82BB6A" type="pagebuilder_advanced_border_color_property">
166173
<data key="name">Border Color</data>
167174
<data key="section">advanced</data>
@@ -241,6 +248,12 @@
241248
<data key="fieldName">border_width</data>
242249
<data key="value">10</data>
243250
</entity>
251+
<entity name="PageBuilderAdvancedBorderWidthProperty13" type="pagebuilder_advanced_border_width_property">
252+
<data key="name">Border Width</data>
253+
<data key="section">advanced</data>
254+
<data key="fieldName">border_width</data>
255+
<data key="value">13</data>
256+
</entity>
244257
<entity name="PageBuilderAdvancedBorderWidthProperty50" type="pagebuilder_advanced_border_width_property">
245258
<data key="name">Border Width</data>
246259
<data key="section">advanced</data>
@@ -306,6 +319,12 @@
306319
<data key="fieldName">border_radius</data>
307320
<data key="value">12</data>
308321
</entity>
322+
<entity name="PageBuilderAdvancedBorderRadiusProperty27" type="pagebuilder_advanced_border_radius_property">
323+
<data key="name">Border Radius</data>
324+
<data key="section">advanced</data>
325+
<data key="fieldName">border_radius</data>
326+
<data key="value">27</data>
327+
</entity>
309328
<entity name="PageBuilderAdvancedBorderRadiusProperty20" type="pagebuilder_advanced_border_radius_property">
310329
<data key="name">Border Radius</data>
311330
<data key="section">advanced</data>
@@ -508,6 +527,36 @@
508527
<data key="marginBottom">3</data>
509528
<data key="marginLeft">4</data>
510529
</entity>
530+
<entity name="PageBuilderMarginsPropertyUnique2345" type="pagebuilder_margins_property">
531+
<data key="name">Margins and Padding</data>
532+
<data key="section">advanced</data>
533+
<data key="fieldName">margins_and_padding</data>
534+
<data key="value">2 3 4 5</data>
535+
<data key="marginTop">2</data>
536+
<data key="marginRight">3</data>
537+
<data key="marginBottom">4</data>
538+
<data key="marginLeft">5</data>
539+
</entity>
540+
<entity name="PageBuilderMarginsPropertyUnique3456" type="pagebuilder_margins_property">
541+
<data key="name">Margins and Padding</data>
542+
<data key="section">advanced</data>
543+
<data key="fieldName">margins_and_padding</data>
544+
<data key="value">3 4 5 6</data>
545+
<data key="marginTop">3</data>
546+
<data key="marginRight">4</data>
547+
<data key="marginBottom">5</data>
548+
<data key="marginLeft">6</data>
549+
</entity>
550+
<entity name="PageBuilderMarginsPropertyUnique12131415" type="pagebuilder_margins_property">
551+
<data key="name">Margins and Padding</data>
552+
<data key="section">advanced</data>
553+
<data key="fieldName">margins_and_padding</data>
554+
<data key="value">12 13 14 15</data>
555+
<data key="marginTop">12</data>
556+
<data key="marginRight">13</data>
557+
<data key="marginBottom">14</data>
558+
<data key="marginLeft">15</data>
559+
</entity>
511560
<entity name="PageBuilderMarginsProperty_NonNumeric" type="pagebuilder_margins_property">
512561
<data key="name">Margins and Padding</data>
513562
<data key="section">advanced</data>
@@ -659,6 +708,46 @@
659708
<data key="paddingBottom">3</data>
660709
<data key="paddingLeft">4</data>
661710
</entity>
711+
<entity name="PageBuilderPaddingPropertyUnique5678" type="pagebuilder_padding_property">
712+
<data key="name">Margins and Padding</data>
713+
<data key="section">advanced</data>
714+
<data key="fieldName">margins_and_padding</data>
715+
<data key="value">5 6 7 8</data>
716+
<data key="paddingTop">5</data>
717+
<data key="paddingRight">6</data>
718+
<data key="paddingBottom">7</data>
719+
<data key="paddingLeft">8</data>
720+
</entity>
721+
<entity name="PageBuilderPaddingPropertyUnique6789" type="pagebuilder_padding_property">
722+
<data key="name">Margins and Padding</data>
723+
<data key="section">advanced</data>
724+
<data key="fieldName">margins_and_padding</data>
725+
<data key="value">6 7 8 9</data>
726+
<data key="paddingTop">6</data>
727+
<data key="paddingRight">7</data>
728+
<data key="paddingBottom">8</data>
729+
<data key="paddingLeft">9</data>
730+
</entity>
731+
<entity name="PageBuilderPaddingPropertyUnique78910" type="pagebuilder_padding_property">
732+
<data key="name">Margins and Padding</data>
733+
<data key="section">advanced</data>
734+
<data key="fieldName">margins_and_padding</data>
735+
<data key="value">7 8 9 10</data>
736+
<data key="paddingTop">7</data>
737+
<data key="paddingRight">8</data>
738+
<data key="paddingBottom">9</data>
739+
<data key="paddingLeft">10</data>
740+
</entity>
741+
<entity name="PageBuilderPaddingPropertyUnique16171819" type="pagebuilder_padding_property">
742+
<data key="name">Margins and Padding</data>
743+
<data key="section">advanced</data>
744+
<data key="fieldName">margins_and_padding</data>
745+
<data key="value">16 17 18 19</data>
746+
<data key="paddingTop">16</data>
747+
<data key="paddingRight">17</data>
748+
<data key="paddingBottom">18</data>
749+
<data key="paddingLeft">19</data>
750+
</entity>
662751
<entity name="PageBuilderPaddingPropertyInvalid" type="pagebuilder_padding_property">
663752
<data key="name">Margins and Padding</data>
664753
<data key="section">advanced</data>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@
6666
<data key="value">#21ffff</data>
6767
<data key="rgb">rgb(33, 255, 255)</data>
6868
</entity>
69+
<entity name="PageBuilderBackgroundColorProperty_BE0005" type="pagebuilder_column_background_color_property">
70+
<data key="name">Background Color</data>
71+
<data key="section">background</data>
72+
<data key="fieldName">background_color</data>
73+
<data key="value">#be0005</data>
74+
<data key="rgb">rgb(190, 0, 5)</data>
75+
</entity>
6976
<entity name="PageBuilderBackgroundColorProperty_FF5A5F" type="pagebuilder_column_background_color_property">
7077
<data key="name">Background Color</data>
7178
<data key="section">background</data>
@@ -178,6 +185,24 @@
178185
<data key="maximumGridSizeErrorMessage">Please enter a value less than or equal to</data>
179186
<data key="smallerThanTotalColumnsErrorMessage">Grid size cannot be smaller than the current total amount of columns, minus any empty columns.</data>
180187
</entity>
188+
<entity name="PageBuilderAdvancedPropertyColumnOneClass" type="pagebuilder_advanced_css_classes_property">
189+
<data key="name">CSS Classes</data>
190+
<data key="section">advanced</data>
191+
<data key="fieldName">css_classes</data>
192+
<data key="value">test-column1-css</data>
193+
</entity>
194+
<entity name="PageBuilderAdvancedPropertyColumnOneEditClass" type="pagebuilder_advanced_css_classes_property">
195+
<data key="name">CSS Classes</data>
196+
<data key="section">advanced</data>
197+
<data key="fieldName">css_classes</data>
198+
<data key="value">test-column1-css-edited</data>
199+
</entity>
200+
<entity name="PageBuilderAdvancedPropertyColumnTwoClass" type="pagebuilder_advanced_css_classes_property">
201+
<data key="name">CSS Classes</data>
202+
<data key="section">advanced</data>
203+
<data key="fieldName">css_classes</data>
204+
<data key="value">test-column2-css</data>
205+
</entity>
181206
<entity name="PageBuilderColumnDuplicate" type="pagebuilder_column">
182207
<data key="cannotDuplicateColumnErrorMessage">There is no free space within the column group to perform this action</data>
183208
</entity>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,19 @@
2323
<data key="style">min-height: 500px</data>
2424
<data key="tooltipText">Style changes will only affect this breakpoint</data>
2525
</entity>
26+
<entity name="PageBuilderColumnGroupMinHeightProperty_345" type="pagebuilder_column_group_min_height_property">
27+
<data key="name">Minimum Height</data>
28+
<data key="section">general</data>
29+
<data key="fieldName">min_height</data>
30+
<data key="value">345</data>
31+
<data key="intValue">345</data>
32+
<data key="style">min-height: 345px</data>
33+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
34+
</entity>
35+
<entity name="PageBuilderAdvancedPropertyColumnGroupClass" type="pagebuilder_advanced_css_classes_property">
36+
<data key="name">CSS Classes</data>
37+
<data key="section">advanced</data>
38+
<data key="fieldName">css_classes</data>
39+
<data key="value">test-columns-css</data>
40+
</entity>
2641
</entities>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@
8686
<data key="style">min-height: 200px</data>
8787
<data key="tooltipText">Style changes will only affect this breakpoint</data>
8888
</entity>
89+
<entity name="PageBuilderMinHeightProperty_100" type="pagebuilder_min_height_property">
90+
<data key="name">Minimum Height</data>
91+
<data key="section">appearance_fieldset</data>
92+
<data key="fieldName">min_height</data>
93+
<data key="value">100</data>
94+
<data key="style">min-height: 100px</data>
95+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
96+
</entity>
8997
<entity name="PageBuilderMinHeightProperty_200px" type="pagebuilder_min_height_property">
9098
<data key="name">Minimum Height</data>
9199
<data key="section">appearance_fieldset</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnGroupSection/ColumnGroupOnFrontendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<element name="backgroundPath" type="button" selector="(//div[@data-content-type=&quot;column-group&quot;])[{{arg1}}]" parameterized="true"/>
1616
<!-- Advanced Configuration -->
1717
<element name="advancedConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;column-group&quot;])[{{arg1}}]" parameterized="true"/>
18-
<element name="cssClasses" type="text" selector="(//div[@data-content-type='column-group'])[{{arg1}}]/div[contains(@class,'{{arg2}}')]" parameterized="true"/>
18+
<element name="cssClasses" type="text" selector="(//div[@data-content-type='column-group'])[{{arg1}}][contains(@class, '{{arg2}}')]" parameterized="true"/>
1919
</section>
2020
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="ColumnGroupEditSettingsAndVerifyTest" extends="ColumnGroupSettingsTest" >
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Columns"/>
14+
<title value="Edit existing Column Group and Column content type settings and verify"/>
15+
<description value="A user should be able edit Column and Column Group content type settings"/>
16+
<severity value="MAJOR"/>
17+
<useCaseId value=""/>
18+
<testCaseId value=""/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-column"/>
21+
<group value="pagebuilder-column-group"/>
22+
</annotations>
23+
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeSecondColumn">
24+
<argument name="contentType" value="PageBuilderColumnContentType"/>
25+
<argument name="contentTypeNumber" value="2"/>
26+
</actionGroup>
27+
<actionGroup ref="confirmRemovalModal" stepKey="confirmRemovalModal"/>
28+
<seeNumberOfElements selector="{{ColumnOnBackend.base}}" userInput="1" stepKey="seeOneColumnOnStage"/>
29+
<!-- Duplicate Column One-->
30+
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
31+
<argument name="contentType" value="PageBuilderColumnContentType"/>
32+
</actionGroup>
33+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1','3/6')}}" stepKey="findBeforeLabelColumn1"/>
34+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','3/6')}}" stepKey="findBeforeLabelColumn2"/>
35+
<!-- Drag Third Column to Column Group-->
36+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnToColumnGroup">
37+
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
38+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
39+
<argument name="containerTargetIndex" value="2"/>
40+
</actionGroup>
41+
<!-- Verify Three Columns -->
42+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1','3/6')}}" stepKey="findBeforeLabelColumnOne"/>
43+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','1/6')}}" stepKey="findBeforeLabelColumnTwo"/>
44+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('3','2/6')}}" stepKey="findBeforeLabelColumnThree"/>
45+
<!-- Edit Column One-->
46+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
47+
<argument name="contentType" value="PageBuilderColumnContentType"/>
48+
<argument name="contentTypeIndex" value="1"/>
49+
</actionGroup>
50+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editColumnAppearancePropertyColumn1">
51+
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
52+
</actionGroup>
53+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editMinHeightPropertyColumn1">
54+
<argument name="property" value="PageBuilderMinHeightProperty_100"/>
55+
</actionGroup>
56+
<actionGroup ref="chooseVisualSelectOption" stepKey="editVerticalAlignmentPropertyColumn1">
57+
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
58+
</actionGroup>
59+
<actionGroup ref="fillSlideOutPanelField" stepKey="editBackgroundColorProperty1Column1">
60+
<argument name="property" value="PageBuilderBackgroundColorProperty_BE0005"/>
61+
</actionGroup>
62+
<actionGroup ref="attachFileSlideOutProperty" stepKey="removePageBuilderFileColumn1">
63+
<argument name="property" value="PageBuilderBackgroundImage_None"/>
64+
</actionGroup>
65+
<actionGroup ref="chooseVisualSelectOption" stepKey="editBackgroundSizeColumn1">
66+
<argument name="property" value="PageBuilderBackgroundSize_Cover"/>
67+
</actionGroup>
68+
<actionGroup ref="selectSlideOutPanelField" stepKey="editBackgroundPositionColumn1">
69+
<argument name="property" value="PageBuilderBackgroundPosition_BottomCenter"/>
70+
</actionGroup>
71+
<actionGroup ref="selectSlideOutPanelField" stepKey="editBackgroundAttachmentColumn1">
72+
<argument name="property" value="PageBuilderBackgroundAttachment_Scroll"/>
73+
</actionGroup>
74+
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="editBackgroundRepeat">
75+
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
76+
</actionGroup>
77+
<actionGroup ref="chooseVisualSelectOption" stepKey="editAlignmentColumn1">
78+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
79+
</actionGroup>
80+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="EditColumn1Border7">
81+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
82+
</actionGroup>
83+
<actionGroup ref="fillSlideOutPanelField" stepKey="editBorderColorColumn1">
84+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_FB00FF"/>
85+
</actionGroup>
86+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editBorderWidthColumn1">
87+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty13"/>
88+
</actionGroup>
89+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editBorderRadiusColumn1">
90+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty27"/>
91+
</actionGroup>
92+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editCssClassesColumn1">
93+
<argument name="property" value="PageBuilderAdvancedPropertyColumnOneEditClass"/>
94+
</actionGroup>
95+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="editMarginsColumn1">
96+
<argument name="property" value="PageBuilderMarginsPropertyUnique12131415"/>
97+
</actionGroup>
98+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="editPaddingColumn1">
99+
<argument name="property" value="PageBuilderPaddingPropertyUnique16171819"/>
100+
</actionGroup>
101+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn1"/>
102+
<!-- Save Page -->
103+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
104+
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
105+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
106+
<!-- Verify Storefront -->
107+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
108+
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
109+
</actionGroup>
110+
<!-- Verify Column One -->
111+
<actionGroup ref="ValidateAllBackgroundAttributesActionGroup" stepKey="validateColumnOneBackgroundOnStorefront">
112+
<argument name="section" value="ColumnOnFrontend"/>
113+
<argument name="backgroundColor" value="PageBuilderBackgroundColorProperty_BE005"/>
114+
<argument name="backgroundImage" value="PageBuilderColumnOneDesktopImage_PNG"/>
115+
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopRight"/>
116+
<argument name="backgroundSize" value="PageBuilderBackgroundSize_Auto"/>
117+
<argument name="backgroundRepeat" value="PageBuilderBackgroundRepeat_Disabled"/>
118+
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Scroll"/>
119+
</actionGroup>
120+
<actionGroup ref="ValidateAdvancedConfigurationAllOptionsActionGroup" stepKey="validateColumnOneAllAdvancedStorefront">
121+
<argument name="page" value="ColumnOnFrontend"/>
122+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
123+
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
124+
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_82BB6A"/>
125+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
126+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
127+
<argument name="cssClasses" value="PageBuilderAdvancedPropertyColumnOneClass"/>
128+
<argument name="margin" value="PageBuilderMarginsPropertyUnique2345"/>
129+
<argument name="padding" value="PageBuilderPaddingPropertyUnique6789"/>
130+
</actionGroup>
131+
132+
133+
</test>
134+
</tests>

0 commit comments

Comments
 (0)