Skip to content

Commit 67d2cd9

Browse files
thiaramusthiaramus
committed
Merge branch 'develop' of https://github.com/magento-commerce/magento2-page-builder into TANGO_PR-02-03-2021_24
2 parents 75437ce + 53a4c4e commit 67d2cd9

File tree

63 files changed

+1864
-104
lines changed

Some content is hidden

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

63 files changed

+1864
-104
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup" extends="NavigateToCreatedCMSPageActionGroup">
12+
<annotations>
13+
<description>EXTENDS NavigateToCreatedCMSPageActionGroup. Searches for and goes to the edit page of a created CMS page in admin. Removes URL navigation for secret key testing.</description>
14+
</annotations>
15+
<remove keyForRemoval="navigateToCMSPagesGrid"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
<argument name="index" defaultValue="1" type="string"/>
1313
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
1414
<argument name="headingAlignment" defaultValue="PageBuilderHeadingAlignmentProperty_left"/>
15+
<argument name="headingText" defaultValue="{{PageBuilderHeadingTextProperty.value}}" type="string"/>
1516
</arguments>
1617
<comment userInput="Edit heading text inline on stage" stepKey="commentEditHeading"/>
17-
<pressKey selector="{{HeadingOnStage.headingEditableText(index)}}" userInput="{{PageBuilderHeadingTextProperty.value}}" stepKey="enterHeadingText"/>
18+
<pressKey selector="{{HeadingOnStage.headingEditableText(index)}}" userInput="{{headingText}}" stepKey="enterHeadingText"/>
1819
<waitForPageLoad stepKey="waitForToolbar" time="30"/>
1920
<waitForElementVisible selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="waitForToolbarVisible"/>
2021
<click selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="clickHeadingType"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup">
11+
<annotations>
12+
<description>Navigates to the Page Builder Templates grid page with Secret Key Enabled.</description>
13+
</annotations>
14+
<remove keyForRemoval="goToPageBuilderTemplatesGridPage"/>
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,30 @@
5151
<data key="rgb">rgb(8, 126, 139)</data>
5252
<data key="hex">#087e8b</data>
5353
</entity>
54+
<entity name="PageBuilderBackgroundColor_Sprout" type="pagebuilder_background_color_property">
55+
<data key="name">Background Color</data>
56+
<data key="section">background</data>
57+
<data key="fieldName">background_color</data>
58+
<data key="value">#a8d098</data>
59+
<data key="rgb">rgb(168, 208, 152)</data>
60+
<data key="hex">#a8d098</data>
61+
</entity>
62+
<entity name="PageBuilderBackgroundColor_TonysPink" type="pagebuilder_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">#e48587</data>
67+
<data key="rgb">rgb(228, 133, 135)</data>
68+
<data key="hex">#e48587</data>
69+
</entity>
70+
<entity name="PageBuilderBackgroundColor_Cornflower" type="pagebuilder_background_color_property">
71+
<data key="name">Background Color</data>
72+
<data key="section">background</data>
73+
<data key="fieldName">background_color</data>
74+
<data key="value">#8fb8e3</data>
75+
<data key="rgb">rgb(143, 184, 227)</data>
76+
<data key="hex">#8fb8e3</data>
77+
</entity>
5478
<entity name="PageBuilderBackgroundColor_Salmon" type="pagebuilder_background_color_property">
5579
<data key="name">Background Color</data>
5680
<data key="section">background</data>

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,46 @@
8686
<data key="fieldName">heading_text</data>
8787
<data key="value"> nbsp nbsp </data>
8888
</entity>
89+
<entity name="PageBuilderHeading_VisitorsAndRegisteredCustomers" extends="PageBuilderHeadingTextDefaultProperty" type="pagebuilder_heading_text_property">
90+
<data key="value">Visitors and Registered Customers</data>
91+
</entity>
92+
<entity name="PageBuilderHeading_AllSegments" extends="PageBuilderHeadingTextDefaultProperty" type="pagebuilder_heading_text_property">
93+
<data key="value">All Segments</data>
94+
</entity>
95+
<entity name="PageBuilderHeading_RegisteredCustomers" extends="PageBuilderHeadingTextDefaultProperty" type="pagebuilder_heading_text_property">
96+
<data key="value">Registered Customers</data>
97+
</entity>
98+
<entity name="PageBuilderHeading_Visitors" extends="PageBuilderHeadingTextDefaultProperty" type="pagebuilder_heading_text_property">
99+
<data key="value">Visitors</data>
100+
</entity>
101+
<entity name="PageBuilderHeadingText_Description" type="pagebuilder_heading_text_property">
102+
<data key="name">Heading Text</data>
103+
<data key="section">general</data>
104+
<data key="fieldName">heading_text</data>
105+
<data key="value">Description</data>
106+
</entity>
107+
<entity name="PageBuilderHeadingText_ShortDescription" type="pagebuilder_heading_text_property">
108+
<data key="name">Heading Text</data>
109+
<data key="section">general</data>
110+
<data key="fieldName">heading_text</data>
111+
<data key="value">Short Description</data>
112+
</entity>
113+
<entity name="PageBuilderHeadingText_CustomAttribute" type="pagebuilder_heading_text_property">
114+
<data key="name">Heading Text</data>
115+
<data key="section">general</data>
116+
<data key="fieldName">heading_text</data>
117+
<data key="value">Custom Page Builder Attribute</data>
118+
</entity>
119+
<entity name="PageBuilderHeadingText_PageContent" type="pagebuilder_heading_text_property">
120+
<data key="name">Heading Text</data>
121+
<data key="section">general</data>
122+
<data key="fieldName">heading_text</data>
123+
<data key="value">Page Content</data>
124+
</entity>
125+
<entity name="PageBuilderHeadingText_CMSBlock" type="pagebuilder_heading_text_property">
126+
<data key="name">Heading Text</data>
127+
<data key="section">general</data>
128+
<data key="fieldName">heading_text</data>
129+
<data key="value">CMS Block</data>
130+
</entity>
89131
</entities>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="productAttributePageBuilder" extends="productAttributeWysiwyg" type="ProductAttribute">
12+
<data key="frontend_label">Page Builder Attribute</data>
13+
<data key="attribute_code" unique="suffix">page_builder_attribute</data>
14+
<data key="frontend_input_admin">Page Builder</data>
15+
<data key="is_searchable">false</data>
16+
<data key="is_comparable">false</data>
17+
<data key="is_filterable">false</data>
18+
<data key="is_filterable_in_search">false</data>
19+
<data key="is_used_for_promo_rules">false</data>
20+
<data key="used_in_product_listing">false</data>
21+
<data key="used_for_sort_by">false</data>
22+
<data key="is_html_allowed_on_front">true</data>
23+
<data key="is_pagebuilder_enabled">true</data>
24+
</entity>
25+
<entity name="AddToDefaultSet_ContentGroup" type="ProductAttributeSet" extends="AddToDefaultSet">
26+
<data key="attributeGroupId">13</data>
27+
<data key="sortOrder">2</data>
28+
</entity>
29+
</entities>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,10 @@
141141
<item name="Magento_PageBuilder::template_delete">Magento_PageBuilder::template_delete</item>
142142
</array>
143143
</entity>
144+
<!-- Admin Menu -->
145+
<entity name="AdminMenuContentElementsTemplates">
146+
<data key="pageTitle">Templates</data>
147+
<data key="title">Templates</data>
148+
<data key="dataUiId">magento-pagebuilder-templates</data>
149+
</entity>
144150
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<element name="editableButtonItemElement" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a//span[@contenteditable='true']" parameterized="true"/>
2323
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a[@href='{{link}}']" parameterized="true"/>
2424
<element name="imageOnStage" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//img[contains(@src,'{{image}}')]" parameterized="true"/>
25-
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]/div[contains(@style,'{{image}}')]" parameterized="true"/>
25+
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]/div[contains(@data-background-images,'{{image}}')]" parameterized="true"/>
2626
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
2727
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-variable') and contains(@class, 'magento-placeholder')]" parameterized="true"/>
2828
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontCategoryMainSection.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@
1111
<!-- This goes in CE repo -->
1212
<element name="CatalogDescription" type="text" selector="//div[@class='category-description']"/>
1313
<element name="DataAppearanceRow" type="text" selector="div.category-description > [data-appearance='{{appearance}}']" parameterized="true"/>
14+
<!-- Category Contents -->
15+
<element name="categoryTitleWrapper" type="button" selector=".page-title-wrapper"/>
16+
<element name="categoryImage" type="button" selector=".category-image"/>
17+
<element name="categoryDescription" type="text" selector=".category-description"/>
18+
<element name="categoryCMS" type="text" selector=".category-cms"/>
19+
<element name="productGrid" type="block" selector="#maincontent .column.main"/>
20+
<element name="sidebarFilters" type="block" selector="#maincontent .sidebar.sidebar-main"/>
21+
<element name="sidebarAdditional" type="block" selector="#maincontent .sidebar.sidebar-additional"/>
1422
</section>
1523
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="StorefrontProductFullWidth">
11+
<element name="title" type="text" selector="[data-ui-id=page-title-wrapper]"/>
12+
<element name="reviewsSummary" type="text" selector=".product-reviews-summary"/>
13+
<element name="priceInfoForm" type="text" selector=".product-info-price"/>
14+
<element name="addProductForm" type="text" selector=".product-add-form"/>
15+
<element name="socialLinksForm" type="text" selector=".product-social-links"/>
16+
<element name="shortDescription" type="button" selector=".product-info-main div.product.attribute.overview div.value"/>
1117
<element name="description" type="button" selector=".page-main-description"/>
1218
<element name="attributes" type="button" selector=".page-main-pagebuilder-attributes"/>
1319
<element name="moreInformation" type="button" selector=".additional-attributes-wrapper"/>

0 commit comments

Comments
 (0)