Skip to content

Commit 7d1c8ed

Browse files
tjwiebelltjwiebell
authored
Merge pull request #53 from magento-obsessive-owls/cms-pagebuilder-test-debt-hackathon-1
Cms pagebuilder test debt hackathon 1
2 parents c28e1cd + 568881a commit 7d1c8ed

File tree

62 files changed

+3153
-925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3153
-925
lines changed

‎dev/build/dev

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dev/tests/acceptance/tests/_suite/suite.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
9+
<suite name="PageBuilderWithWYSIWYG">
10+
<before>
11+
<createData stepKey="enablePageBuilderAndWYSIWYG" entity="enablePageBuilderAndWYSIWYGForm"/>
12+
</before>
13+
<after>
14+
<createData stepKey="DisabledWYSIWYG" entity="disableWYSYWYGForm"/>
15+
</after>
16+
<include>
17+
<group name="pagebuilder"/>
18+
</include>
19+
<exclude>
20+
<group name="pagebuilder-customBeforeAfter"/>
21+
</exclude>
22+
</suite>
23+
</suites>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Banner/Test/AdminPageBuilderEnabledTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
2625
</before>
2726
<after>
2827
<actionGroup ref="logout" stepKey="logout"/>
@@ -42,6 +41,7 @@
4241
<severity value="CRITICAL"/>
4342
<group value="pagebuilder"/>
4443
<group value="pagebuilder-ee"/>
44+
<group value="pagebuilder-customBeforeAfter"/>
4545
</annotations>
4646
<before>
4747
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/ActionGroup.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,12 @@
179179
<arguments>
180180
<argument name="contentBlockType" defaultValue=""/>
181181
<argument name="contentBlockNumber" defaultValue="2" type="string"/>
182+
<argument name="x" defaultValue="null" type="string"/>
183+
<argument name="y" defaultValue="null" type="string"/>
182184
</arguments>
183185
<seeElement selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockNumber)}}" stepKey="seeContentTypeInStage" />
184186
<waitForElementVisible time="20" selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockNumber)}}" stepKey="waitForContentBlockInStageVisible" />
185-
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockNumber)}}" x="10" y="0" stepKey="onMouseOverContentBlockStage"/>
187+
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(contentBlockType.role, contentBlockNumber)}}" x="{{x}}" y="{{y}}" stepKey="onMouseOverContentBlockStage"/>
186188
<wait time="0.5" stepKey="waitForMouseOverAnimation" />
187189
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenuByIndex(contentBlockType.role, contentBlockNumber)}}" stepKey="waitForOptions" />
188190
<click selector="{{PageBuilderActionsSection.contentBlockRemoveByIndex(contentBlockType.role, contentBlockNumber)}}" stepKey="clickRemoveContentBlock"/>
@@ -194,6 +196,7 @@
194196
<wait time="1" stepKey="waitForModalEventBinding" />
195197
<click selector="{{PageBuilderActionsSection.modalOk}}" stepKey="confirmRemoveModal"/>
196198
<waitForElementNotVisible time="1" selector="{{PageBuilderActionsSection.modalOk}}" stepKey="waitForModalHide" />
199+
<waitForPageLoad stepKey="waitForPageLoad"/>
197200
</actionGroup>
198201

199202
<!-- Remove a content block which has been configured with data or has children -->

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/DividerActionGroup.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,40 @@
2121
<waitForElementVisible selector="{{page.thickness(index, thickness.value)}}" stepKey="waitForThicknessVisible"/>
2222
<waitForElementVisible selector="{{page.width(index, width.value)}}" stepKey="waitForWidthVisible"/>
2323
</actionGroup>
24+
<actionGroup name="validateDividerWithoutColor">
25+
<arguments>
26+
<argument name="page" defaultValue=""/>
27+
<argument name="index" defaultValue="1" type="string"/>
28+
<argument name="thickness" defaultValue="PageBuilderDividerLineThickness_Default"/>
29+
<argument name="width" defaultValue="PageBuilderDividerLineWidth_Default"/>
30+
</arguments>
31+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
32+
<waitForElementVisible selector="{{page.noColor(index)}}" stepKey="waitForColorVisible"/>
33+
<waitForElementVisible selector="{{page.thickness(index, thickness.value)}}" stepKey="waitForThicknessVisible"/>
34+
<waitForElementVisible selector="{{page.width(index, width.value)}}" stepKey="waitForWidthVisible"/>
35+
</actionGroup>
36+
<actionGroup name="validateDividerWithoutThickness">
37+
<arguments>
38+
<argument name="page" defaultValue=""/>
39+
<argument name="index" defaultValue="1" type="string"/>
40+
<argument name="color" defaultValue="PageBuilderDividerLineColor_Default"/>
41+
<argument name="width" defaultValue="PageBuilderDividerLineWidth_Default"/>
42+
</arguments>
43+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
44+
<waitForElementVisible selector="{{page.color(index, color.rgb)}}" stepKey="waitForColorVisible"/>
45+
<waitForElementVisible selector="{{page.noThickness(index)}}" stepKey="waitForThicknessVisible"/>
46+
<waitForElementVisible selector="{{page.width(index, width.value)}}" stepKey="waitForWidthVisible"/>
47+
</actionGroup>
48+
<actionGroup name="validateDividerWithoutWidth">
49+
<arguments>
50+
<argument name="page" defaultValue=""/>
51+
<argument name="index" defaultValue="1" type="string"/>
52+
<argument name="color" defaultValue="PageBuilderDividerLineColor_Default"/>
53+
<argument name="thickness" defaultValue="PageBuilderDividerLineThickness_Default"/>
54+
</arguments>
55+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
56+
<waitForElementVisible selector="{{page.color(index, color.rgb)}}" stepKey="waitForColorVisible"/>
57+
<waitForElementVisible selector="{{page.thickness(index, thickness.value)}}" stepKey="waitForThicknessVisible"/>
58+
<waitForElementVisible selector="{{page.noWidth(index)}}" stepKey="waitForWidthVisible"/>
59+
</actionGroup>
2460
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/AnchorData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<data key="section">general</data>
1515
<data key="fieldName">id</data>
1616
<data key="text">Anchor</data>
17+
<data key="errorMessage">This is a required field.</data>
1718
</entity>
1819
<entity name="PageBuilderAnchorIdentifier" type="pagebuilder_anchor_identifier_property">
1920
<data key="name">Identifier</data>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/CmsConfigData.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="enablePageBuilderAndWYSIWYGForm" type="config">
12+
<data key="config_state[cms_wysiwyg]">true</data>
13+
<data key="groups[wysiwyg][fields][enabled][value]">enabled</data>
14+
<data key="groups[wysiwyg][fields][editor][inherit]">true</data>
15+
<data key="groups[wysiwyg][fields][use_static_urls_in_catalog][value]">false</data>
16+
<data key="config_state[cms_pagebuilder]">true</data>
17+
<data key="groups[pagebuilder][fields][enabled][value]">true</data>
18+
</entity>
19+
<entity name="disableWYSYWYGForm" type="config">
20+
<data key="config_state[cms_wysiwyg]">false</data>
21+
<data key="groups[wysiwyg][fields][enabled][value]">disabled</data>
22+
<data key="groups[wysiwyg][fields][editor][inherit]">true</data>
23+
<data key="groups[wysiwyg][fields][use_static_urls_in_catalog][value]">false</data>
24+
<data key="config_state[cms_pagebuilder]">false</data>
25+
<data key="groups[pagebuilder][fields][enabled][value]">true</data>
26+
</entity>
27+
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/DividerData.xml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,20 @@
2323
<data key="value">#cecece</data>
2424
<data key="rgb">rgb(206, 206, 206)</data>
2525
</entity>
26+
<entity name="PageBuilderDividerLineColor_Empty" type="pagebuilder_divider_line_color_property">
27+
<data key="name">Line Color</data>
28+
<data key="section">general</data>
29+
<data key="fieldName">line_color</data>
30+
<data key="value"/>
31+
<data key="rgb">rgb(206, 206, 206)</data>
32+
</entity>
33+
<entity name="PageBuilderDividerLineColor_Yellow" type="pagebuilder_divider_line_color_property">
34+
<data key="name">Line Color</data>
35+
<data key="section">general</data>
36+
<data key="fieldName">line_color</data>
37+
<data key="value">yellow</data>
38+
<data key="rgb">yellow</data>
39+
</entity>
2640
<entity name="PageBuilderDividerLineColor_FF5733" type="pagebuilder_divider_line_color_property">
2741
<data key="name">Line Color</data>
2842
<data key="section">general</data>
@@ -37,6 +51,48 @@
3751
<data key="value">#ff5733</data>
3852
<data key="rgb">rgb(255, 87, 51)</data>
3953
</entity>
54+
<entity name="PageBuilderDividerLineColor_FF5833Lower" type="pagebuilder_divider_line_color_property">
55+
<data key="name">Line Color</data>
56+
<data key="section">general</data>
57+
<data key="fieldName">line_color</data>
58+
<data key="value">#ff5833</data>
59+
<data key="rgb">rgb(255, 88, 51)</data>
60+
</entity>
61+
<entity name="PageBuilderDividerLineColor_RGB255_087_051" type="pagebuilder_divider_line_color_property">
62+
<data key="name">Line Color</data>
63+
<data key="section">general</data>
64+
<data key="fieldName">line_color</data>
65+
<data key="value">rgb(255, 87, 51)</data>
66+
<data key="rgb">rgb(255, 87, 51)</data>
67+
</entity>
68+
<entity name="PageBuilderDividerLineColor_RGBA255_087_051_50" type="pagebuilder_divider_line_color_property">
69+
<data key="name">Line Color</data>
70+
<data key="section">general</data>
71+
<data key="fieldName">line_color</data>
72+
<data key="value">rgba(255, 87, 51, 0.5)</data>
73+
<data key="rgb">rgba(255, 87, 51, 0.5)</data>
74+
</entity>
75+
<entity name="PageBuilderDividerLineColor_HSL11_100_60" type="pagebuilder_divider_line_color_property">
76+
<data key="name">Line Color</data>
77+
<data key="section">general</data>
78+
<data key="fieldName">line_color</data>
79+
<data key="value">hsl(11, 100%, 60%)</data>
80+
<data key="rgb">rgb(255, 88, 51)</data>
81+
</entity>
82+
<entity name="PageBuilderDividerLineColor_HSLA11_100_60_50" type="pagebuilder_divider_line_color_property">
83+
<data key="name">Line Color</data>
84+
<data key="section">general</data>
85+
<data key="fieldName">line_color</data>
86+
<data key="value">hsla(11, 100%, 60%, 0.5)</data>
87+
<data key="rgb">rgba(255, 88, 51, 0.5)</data>
88+
</entity>
89+
<entity name="PageBuilderDividerLineColor_Invalid" type="pagebuilder_divider_line_color_property">
90+
<data key="name">Line Color</data>
91+
<data key="section">general</data>
92+
<data key="fieldName">line_color</data>
93+
<data key="value">#GGGGGG</data>
94+
<data key="rgb">rgb()</data>
95+
</entity>
4096
<!-- Line Thickness -->
4197
<entity name="PageBuilderDividerLineThickness_Default" type="pagebuilder_divider_line_thickness_property">
4298
<data key="name">Line Thickness</data>
@@ -50,6 +106,24 @@
50106
<data key="fieldName">line_thickness</data>
51107
<data key="value">10</data>
52108
</entity>
109+
<entity name="PageBuilderDividerLineThickness_0" type="pagebuilder_divider_line_thickness_property">
110+
<data key="name">Line Thickness</data>
111+
<data key="section">general</data>
112+
<data key="fieldName">line_thickness</data>
113+
<data key="value">0</data>
114+
</entity>
115+
<entity name="PageBuilderDividerLineThickness_Negative" type="pagebuilder_divider_line_thickness_property">
116+
<data key="name">Line Thickness</data>
117+
<data key="section">general</data>
118+
<data key="fieldName">line_thickness</data>
119+
<data key="value">-1</data>
120+
</entity>
121+
<entity name="PageBuilderDividerLineThickness_Empty" type="pagebuilder_divider_line_thickness_property">
122+
<data key="name">Line Thickness</data>
123+
<data key="section">general</data>
124+
<data key="fieldName">line_thickness</data>
125+
<data key="value"/>
126+
</entity>
53127
<!-- Line Width -->
54128
<entity name="PageBuilderDividerLineWidth_Default" type="pagebuilder_divider_line_width_property">
55129
<data key="name">Line Width</data>
@@ -63,4 +137,10 @@
63137
<data key="fieldName">line_width</data>
64138
<data key="value">50%</data>
65139
</entity>
140+
<entity name="PageBuilderDividerLineWidth_Empty" type="pagebuilder_divider_line_width_property">
141+
<data key="name">Line Width</data>
142+
<data key="section">general</data>
143+
<data key="fieldName">line_width</data>
144+
<data key="value"/>
145+
</entity>
66146
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/HtmlData.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,29 @@
1313
<data key="name">HTML</data>
1414
<data key="section">general</data>
1515
<data key="fieldName">html</data>
16+
<data key="role">html</data>
1617
<data key="value">Type your HTML here...</data>
1718
</entity>
19+
<entity name="PageBuilderHtmlProperty_Empty" type="pagebuilder_html_property">
20+
<data key="name">HTML</data>
21+
<data key="section">general</data>
22+
<data key="fieldName">html</data>
23+
<data key="role">html</data>
24+
<data key="value"/>
25+
<data key="errorMessage">This is a required field.</data>
26+
</entity>
1827
<entity name="PageBuilderHtmlPropertyButton" type="pagebuilder_html_property">
1928
<data key="name">HTML</data>
2029
<data key="section">general</data>
2130
<data key="fieldName">html</data>
2231
<data key="value">&lt;a class=&quot;pagebuilder-button-primary&quot; onclick=&quot;location.href = 'https://google.com';&quot;&gt;&lt;span&gt;Test Button&lt;/span&gt;&lt;/a&gt;</data>
2332
<data key="selector">//a[@class='pagebuilder-button-primary' and @onclick=&quot;location.href = 'https://google.com';&quot;]//span[.='Test Button']</data>
2433
</entity>
34+
<entity name="PageBuilderHtmlPropertyButtonDuplicate" type="pagebuilder_html_property">
35+
<data key="name">HTML</data>
36+
<data key="section">general</data>
37+
<data key="fieldName">html</data>
38+
<data key="value">&lt;a class=&quot;pagebuilder-button-primary&quot; onclick=&quot;location.href = 'https://google.com';&quot;&gt;&lt;span&gt;Duplicate Button&lt;/span&gt;&lt;/a&gt;</data>
39+
<data key="selector">//a[@class='pagebuilder-button-primary' and @onclick=&quot;location.href = 'https://google.com';&quot;]//span[.='Duplicate Button']</data>
40+
</entity>
2541
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Data/MapData.xml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Map Position -->
1112
<entity name="PageBuilderMapPositionDefaultProperty" type="pagebuilder_map_position_property">
1213
<data key="name">Position</data>
1314
<data key="section">general</data>
1415
<data key="fieldName">position</data>
1516
<data key="position">"/{\"lat\".30.\d+,\"lng\".-97.\d+,\"zoom\".8}/"</data>
1617
</entity>
18+
<!-- Width -->
1719
<entity name="PageBuilderMapWidthDefaultProperty" type="pagebuilder_map_width_property">
1820
<data key="name">Width</data>
1921
<data key="section">general</data>
@@ -25,7 +27,16 @@
2527
<data key="section">general</data>
2628
<data key="fieldName">width</data>
2729
<data key="value">75%</data>
30+
<data key="integer">75</data>
2831
</entity>
32+
<entity name="PageBuilderMapWidthProperty500px" type="pagebuilder_map_width_property">
33+
<data key="name">Width</data>
34+
<data key="section">general</data>
35+
<data key="fieldName">width</data>
36+
<data key="value">500px</data>
37+
<data key="integer">500</data>
38+
</entity>
39+
<!-- Height -->
2940
<entity name="PageBuilderMapHeightDefaultProperty" type="pagebuilder_map_height_property">
3041
<data key="name">Height</data>
3142
<data key="section">general</data>
@@ -38,10 +49,11 @@
3849
<data key="fieldName">height</data>
3950
<data key="value">350px</data>
4051
</entity>
41-
<entity name="PageBuilderMapIndex1" type="pagebuilder_map_index_1">
42-
<data key="index">1</data>
43-
</entity>
44-
<entity name="PageBuilderMapIndex2" type="pagebuilder_map_index_2">
45-
<data key="index">2</data>
52+
<entity name="PageBuilderMapHeightProperty500px" type="pagebuilder_map_height_property">
53+
<data key="name">Height</data>
54+
<data key="section">general</data>
55+
<data key="fieldName">height</data>
56+
<data key="value">500px</data>
57+
<data key="integer">500</data>
4658
</entity>
4759
</entities>

0 commit comments

Comments
 (0)