Skip to content

Commit f09350b

Browse files
paras89paras89
committed
PB-500 add column group story MFTF coverage
1 parent 879e108 commit f09350b

File tree

9 files changed

+472
-3
lines changed

9 files changed

+472
-3
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelByIndexActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<argument name="contentTypeXCoordinate" defaultValue="null" type="string"/>
1515
<argument name="contentTypeYCoordinate" defaultValue="null" type="string"/>
1616
</arguments>
17-
<executeJS function="return ['row', 'column', 'column-group'].include('{{contentType.role}}') ? '//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(.,&quot;'+'{{contentType.role}}'.toUpperCase()+'&quot;)]' : ['tabs'].include('{{contentType.role}}') ? '//ul[@data-element=&quot;navigation&quot;]' : '';" stepKey="contentTypeLabelSelector" />
17+
<executeJS function="return ['row', 'column', 'column-group'].include('{{contentType.role}}') ? '//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(.,&quot;'+'{{contentType.name}}'.toUpperCase()+'&quot;)]' : ['tabs'].include('{{contentType.role}}') ? '//ul[@data-element=&quot;navigation&quot;]' : '';" stepKey="contentTypeLabelSelector" />
1818
<executeJS function="return ['row'].include('{{contentType.role}}') ? '(//div[contains(@class, &quot;pagebuilder-content-type-affordance&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-affordance-{{contentType.role}} &quot;)])[{{contentTypeIndex}}]' : '(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-{{contentType.role}} &quot;)])[{{contentTypeIndex}}]';" stepKey="contentTypeByIndexSelector" />
1919
<waitForElementVisible time="20" selector="{$contentTypeByIndexSelector}{$contentTypeLabelSelector}" stepKey="waitForContentTypeInStageVisible"/>
2020
<moveMouseOver stepKey="moveMouseOverSearch" selector="{{PageBuilderPanel.searchPanel}}" />

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,23 @@
159159
<data key="name">Border Color</data>
160160
<data key="section">advanced</data>
161161
<data key="fieldName">border_color</data>
162-
<data key="value">#FF0000</data>
162+
<data key="value">#ff0000</data>
163163
<data key="rgb">rgb(255, 0, 0)</data>
164164
</entity>
165+
<entity name="PageBuilderAdvancedBorderColorProperty_82BB6A" 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">#82bb6a</data>
170+
<data key="rgb">rgb(240, 192, 194)</data>
171+
</entity>
172+
<entity name="PageBuilderAdvancedBorderColorProperty_f0c0c2" type="pagebuilder_advanced_border_color_property">
173+
<data key="name">Border Color</data>
174+
<data key="section">advanced</data>
175+
<data key="fieldName">border_color</data>
176+
<data key="value">#f0c0c2"</data>
177+
<data key="rgb">rgb(130, 187, 106)</data>
178+
</entity>
165179
<entity name="PageBuilderAdvancedBorderColorProperty_FF0000_rgb" type="pagebuilder_advanced_border_color_property">
166180
<data key="name">Border Color</data>
167181
<data key="section">advanced</data>
@@ -227,6 +241,12 @@
227241
<data key="fieldName">border_width</data>
228242
<data key="value">10</data>
229243
</entity>
244+
<entity name="PageBuilderAdvancedBorderWidthProperty50" type="pagebuilder_advanced_border_width_property">
245+
<data key="name">Border Width</data>
246+
<data key="section">advanced</data>
247+
<data key="fieldName">border_width</data>
248+
<data key="value">50</data>
249+
</entity>
230250
<entity name="PageBuilderAdvancedBorderWidthProperty500" type="pagebuilder_advanced_border_width_property">
231251
<data key="name">Border Width</data>
232252
<data key="section">advanced</data>
@@ -286,6 +306,18 @@
286306
<data key="fieldName">border_radius</data>
287307
<data key="value">12</data>
288308
</entity>
309+
<entity name="PageBuilderAdvancedBorderRadiusProperty20" type="pagebuilder_advanced_border_radius_property">
310+
<data key="name">Border Radius</data>
311+
<data key="section">advanced</data>
312+
<data key="fieldName">border_radius</data>
313+
<data key="value">20</data>
314+
</entity>
315+
<entity name="PageBuilderAdvancedBorderRadiusProperty60" type="pagebuilder_advanced_border_radius_property">
316+
<data key="name">Border Radius</data>
317+
<data key="section">advanced</data>
318+
<data key="fieldName">border_radius</data>
319+
<data key="value">60</data>
320+
</entity>
289321
<entity name="PageBuilderAdvancedBorderRadiusProperty500" type="pagebuilder_advanced_border_radius_property">
290322
<data key="name">Border Radius</data>
291323
<data key="section">advanced</data>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,24 @@
294294
<data key="extension">png</data>
295295
<data key="path">wysiwyg</data>
296296
</entity>
297+
<entity name="PageBuilderColumnGroupDesktopImage_PNG" type="pagebuilder_background_image_property">
298+
<data key="name">Background Image</data>
299+
<data key="section">background</data>
300+
<data key="fieldName">background_image</data>
301+
<data key="value">COLUMNS_Desktop_background_100x100px.png</data>
302+
<data key="fileName">COLUMNS_Desktop_background_100x100px</data>
303+
<data key="extension">png</data>
304+
<data key="path">wysiwyg</data>
305+
</entity>
306+
<entity name="PageBuilderColumnOneDesktopImage_PNG" type="pagebuilder_background_image_property">
307+
<data key="name">Background Image</data>
308+
<data key="section">background</data>
309+
<data key="fieldName">background_image</data>
310+
<data key="value">COLUMN_1_Desktop_background_100x100px.png</data>
311+
<data key="fileName">COLUMN_1_Desktop_background_100x100px</data>
312+
<data key="extension">png</data>
313+
<data key="path">wysiwyg</data>
314+
</entity>
297315
<entity name="PageBuilderBackgroundImage_SpecialCharacters" type="pagebuilder_background_image_property">
298316
<data key="name">Background Image</data>
299317
<data key="section">background</data>
@@ -399,6 +417,24 @@
399417
<data key="extension">sql</data>
400418
<data key="errorMessage">We don't recognize or support this file extension type.</data>
401419
</entity>
420+
<entity name="PageBuilderColumnGroupMobileImage_PNG" type="pagebuilder_background_image_property">
421+
<data key="name">Background Image</data>
422+
<data key="section">background</data>
423+
<data key="fieldName">mobile_image</data>
424+
<data key="value">COLUMNS_Mobile_background_100x100px.png</data>
425+
<data key="fileName">COLUMNS_Mobile_background_100x100px</data>
426+
<data key="extension">png</data>
427+
<data key="path">wysiwyg</data>
428+
</entity>
429+
<entity name="PageBuilderColumnTwoMobileImage_PNG" type="pagebuilder_background_image_property">
430+
<data key="name">Background Image</data>
431+
<data key="section">background</data>
432+
<data key="fieldName">mobile_image</data>
433+
<data key="value">COLUMN_2_Mobile_background_100x100px.png</data>
434+
<data key="fileName">COLUMN_2_Mobile_background_100x100px</data>
435+
<data key="extension">png</data>
436+
<data key="path">wysiwyg</data>
437+
</entity>
402438
<!-- Background Position -->
403439
<entity name="PageBuilderBackgroundPosition_Default" type="pagebuilder_background_position_property">
404440
<data key="name">Background Position</data>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,20 @@
5252
<data key="fieldName">background_color</data>
5353
<data key="value">#087e8b</data>
5454
</entity>
55+
<entity name="PageBuilderBackgroundColorProperty_FC0009" type="pagebuilder_column_background_color_property">
56+
<data key="name">Background Color</data>
57+
<data key="section">background</data>
58+
<data key="fieldName">background_color</data>
59+
<data key="value">#fc0009</data>
60+
<data key="rgb">rgb(252,0,9)</data>
61+
</entity>
62+
<entity name="PageBuilderBackgroundColorProperty_21FFFF" type="pagebuilder_column_background_color_property">
63+
<data key="name">Background Color</data>
64+
<data key="section">background</data>
65+
<data key="fieldName">background_color</data>
66+
<data key="value">#21ffff</data>
67+
<data key="rgb">rgb(33,255,255)</data>
68+
</entity>
5569
<entity name="PageBuilderBackgroundColorProperty_FF5A5F" type="pagebuilder_column_background_color_property">
5670
<data key="name">Background Color</data>
5771
<data key="section">background</data>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,13 @@
1414
<data key="top">15</data>
1515
<data key="value">30</data>
1616
</entity>
17+
<entity name="PageBuilderColumnGroupMinHeightProperty_500" type="pagebuilder_column_group_min_height_property">
18+
<data key="name">Minimum Height</data>
19+
<data key="section">general</data>
20+
<data key="fieldName">min_height</data>
21+
<data key="value">500</data>
22+
<data key="intValue">500</data>
23+
<data key="style">min-height: 500px</data>
24+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
25+
</entity>
1726
</entities>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<data key="name">Columns</data>
2828
<data key="section">Layout</data>
2929
<data key="role">column-group</data>
30-
<data key="pageNamePrefix">column-group</data>
30+
<data key="pageNamePrefix">columns</data>
3131
</entity>
3232
<entity name="PageBuilderColumnContentType" type="pagebuilder_content_type">
3333
<data key="name">Column</data>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="ColumnGroupOnFrontend">
11+
<element name="base" type="block" selector="(//div[@data-content-type=&quot;column-group&quot;])[{{arg1}}]" parameterized="true"/>
12+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=column-group]')[{{arg1}} - 1]" parameterized="true"/>
13+
<element name="baseCSS" type="text" selector="[data-content-type=column-group]"/>
14+
15+
<!-- Background Configuration -->
16+
<element name="backgroundPath" type="button" selector="(//div[@data-content-type=&quot;column-group&quot;])[{{arg1}}]" parameterized="true"/>
17+
</section>
18+
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="baseCSS" type="text" selector="[data-content-type=column]"/>
1414
<element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
1515
<element name="columnGroup" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]" parameterized="true"/>
16+
<element name="columnGroupWithGridSize" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group') and @data-grid-size={{arg1}}])[{{arg2}}]" parameterized="true"/>
1617
<element name="allColumnGroups" type="block" selector=".pagebuilder-column-group"/>
1718
<element name="allColumns" type="block" selector="(//div[@data-content-type='column'])"/>
1819
<element name="columnX" type="block" selector="[data-content-type=column]:nth-child({{arg1}})" parameterized="true"/>

0 commit comments

Comments
 (0)