Skip to content

Commit 56c9123

Browse files
committed
#429: User can add content to the Stage directly
- made required changes
1 parent 2299793 commit 56c9123

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@
129129
<data key="editPanelName">Block</data>
130130
<data key="pageNamePrefix">block</data>
131131
</entity>
132-
<entity name="PageBuilderDynamicBlockContentType" type="pagebuilder_content_type">
133-
<data key="name">DynamicBlock</data>
134-
<data key="section">Add Content</data>
135-
<data key="role">dynamic_block</data>
136-
<data key="editPanelName">Dynamic Block</data>
137-
<data key="pageNamePrefix">dynamic_block</data>
138-
</entity>
139132
<entity name="PageBuilderProductsContentType" type="pagebuilder_content_type">
140133
<data key="name">Products</data>
141134
<data key="section">Add Content</data>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10-
<section name="`">
10+
<section name="ColumnOnFrontend">
1111
<element name="base" type="block" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
1212
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=column]')[{{arg1}} - 1]" parameterized="true"/>
1313
<element name="baseCSS" type="text" selector="[data-content-type=column]"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ContentCanAddToStageDirectlyTest.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,21 @@
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
25+
<createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
2526
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
2627
<argument name="CMSPage" value="$$createCMSPage$$"/>
2728
</actionGroup>
2829
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
2930
</before>
3031
<after>
32+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
3133
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3234
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3335
</after>
36+
<actionGroup ref="assertTextareaContainsValue" stepKey="assertImageInTextareaValueBeforeSave">
37+
<argument name="value" value="{{ImageUpload3.value}}"/>
38+
<argument name="selector" value="{{HtmlOnConfiguration.textarea}}"/>
39+
</actionGroup>
3440
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
3541
<argument name="contentType" value="PageBuilderRowContentType"/>
3642
</actionGroup>
@@ -73,6 +79,13 @@
7379
<argument name="contentType" value="PageBuilderHtmlContentType"/>
7480
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
7581
</actionGroup>
82+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuHtml">
83+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
84+
</actionGroup>
85+
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
86+
<argument name="property" value="PageBuilderHtmlPropertyButton"/>
87+
</actionGroup>
88+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsHtml"/>
7689
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionMedia">
7790
<argument name="contentType" value="PageBuilderVideoContentType"/>
7891
</actionGroup>
@@ -108,10 +121,13 @@
108121
<argument name="contentType" value="PageBuilderBlockContentType"/>
109122
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
110123
</actionGroup>
111-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDynamicBlockIntoContainer">
112-
<argument name="contentType" value="PageBuilderDynamicBlockContentType"/>
113-
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
124+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDropBlock">
125+
<argument name="contentType" value="PageBuilderBlockContentType"/>
126+
</actionGroup>
127+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInPageGrid">
128+
<argument name="block" value="$$createPreReqBlock$$"/>
114129
</actionGroup>
130+
<actionGroup ref="saveEditPanelSettings" stepKey="savePageEditPanelSettingsBlock"/>
115131
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragProductsIntoStage">
116132
<argument name="contentType" value="PageBuilderProductsContentType"/>
117133
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>

0 commit comments

Comments
 (0)