Skip to content

Commit f76644b

Browse files
petrovsapetrovsa
committed
#429: User can add content to the Stage directly
 - add new test PageBuilderCMSBlockAddContentDirectlyToStageTest - fix cannotDragContentTypeToTarget
1 parent c9ecfca commit f76644b

File tree

3 files changed

+127
-2
lines changed

3 files changed

+127
-2
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<argument name="dropZoneIndex" defaultValue="1" type="string"/>
1717
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
1818
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
19+
<argument name="contentSection" defaultValue="CmsNewPagePageActionsSection.contentSectionName"/>
1920
</arguments>
20-
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
21+
<scrollTo selector="{{contentSection}}" stepKey="scrollToTopOfStage"/>
2122
<waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForTargetActive"/>
2223
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dragContentTypeIntoTarget"/>
2324
<waitForPageLoad time="30" stepKey="waitForAnimation"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockAddContentDirectlyToStageTest.xml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
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="PageBuilderCMSBlockAddContentDirectlyToStageTest" extends="PageBuilderCMSPageAddContentDirectlyToStageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="CMS Block"/>
14+
<title value="Verify Can Only Add Expected Content Types to CMSBlock Stage Directly"/>
15+
<description value="Verify user can add Row, Columns, Tabs, HTML Code, and Blocks to CMS Block stage directly. Verify user cannot add any other content type to MS Block stage directly"/>
16+
<severity value="BLOCKER"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-stage"/>
19+
<group value="pagebuilder-cms-block"/>
20+
</annotations>
21+
<before>
22+
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock" after="loginAsAdmin"/>
23+
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSPage">
24+
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
25+
</actionGroup>
26+
</before>
27+
<after>
28+
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
29+
</after>
30+
<!-- Verify Cannot Add Text to Stage Directly -->
31+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragTextIntoStage">
32+
<argument name="contentType" value="PageBuilderTextContentType"/>
33+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
34+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
35+
</actionGroup>
36+
<!-- Verify Cannot Add Heading to Stage Directly -->
37+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragHeadingIntoStage">
38+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
39+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
40+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
41+
</actionGroup>
42+
<!-- Verify Cannot Add Buttons to Stage Directly -->
43+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragButtonsIntoStage">
44+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
45+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
46+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
47+
</actionGroup>
48+
<!-- Verify Cannot Add Divider to Stage Directly -->
49+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragDividerIntoStage">
50+
<argument name="contentType" value="PageBuilderDividerContentType"/>
51+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
52+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
53+
</actionGroup>
54+
<!-- Verify Cannot Add Video to Stage Directly -->
55+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragVideoIntoStage">
56+
<argument name="contentType" value="PageBuilderVideoContentType"/>
57+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
58+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
59+
</actionGroup>
60+
<!-- Verify Cannot Add Image to Stage Directly -->
61+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragImageIntoStage">
62+
<argument name="contentType" value="PageBuilderImageContentType"/>
63+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
64+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
65+
</actionGroup>
66+
<!-- Verify Cannot Add Map to Stage Directly -->
67+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragMapIntoStage">
68+
<argument name="contentType" value="PageBuilderMapContentType"/>
69+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
70+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
71+
</actionGroup>
72+
<!-- Verify Cannot Add Slider to Stage Directly -->
73+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragSliderIntoStage">
74+
<argument name="contentType" value="PageBuilderSliderContentType"/>
75+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
76+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
77+
</actionGroup>
78+
<!-- Verify Cannot Add Banner to Stage Directly -->
79+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragBannerIntoStage">
80+
<argument name="contentType" value="PageBuilderBannerContentType"/>
81+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
82+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
83+
</actionGroup>
84+
<!-- Verify Cannot Add Products to Stage Directly -->
85+
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragProductsIntoStage">
86+
<argument name="contentType" value="PageBuilderProductsContentType"/>
87+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
88+
<argument name="contentSection" value="BlockNewPageBasicFieldsSection.storeView"/>
89+
</actionGroup>
90+
<!-- Save CMS Block and Verify Expected Content Types on Stage -->
91+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
92+
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlock" after="saveAndContinueEditCmsPage">
93+
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
94+
</actionGroup>
95+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
96+
<!-- Navigate and insert CMSBlock to CMS Page -->
97+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPageForBlock" after="dontSeeProductsAfterSave">
98+
<argument name="CMSPage" value="$$createCMSPage$$"/>
99+
</actionGroup>
100+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreenBlock" after="navigateToCreatedCMSPageForBlock"/>
101+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionContentBlock" after="openPageBuilderFullScreenBlock">
102+
<argument name="contentType" value="PageBuilderBlockContentType"/>
103+
</actionGroup>
104+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBlockIntoContainerBlock" after="expandMenuSectionContentBlock">
105+
<argument name="contentType" value="PageBuilderBlockContentType"/>
106+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
107+
</actionGroup>
108+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoContainerBlock">
109+
<argument name="contentType" value="PageBuilderBlockContentType"/>
110+
</actionGroup>
111+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid" after="openEditAfterDrop">
112+
<argument name="block" value="$$createCMSBlock$$"/>
113+
</actionGroup>
114+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock" after="searchBlockInGrid"/>
115+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBlock" after="saveEditPanelSettingsBlock"/>
116+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageBlock" after="exitPageBuilderFullScreenBlock"/>
117+
<!-- Verify Expected Content Types on Storefront -->
118+
<executeJS function="return document.querySelectorAll(&quot;{{BlockOnStorefront.allBlocks}}&quot;).length" stepKey="numberOfBlockContentTypesStorefront"/>
119+
<assertEquals stepKey="assertBlockStorefront">
120+
<expectedResult type="int">2</expectedResult>
121+
<actualResult type="variable">numberOfBlockContentTypesStorefront</actualResult>
122+
</assertEquals>
123+
</test>
124+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<argument name="contentType" value="PageBuilderDividerContentType"/>
7474
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
7575
</actionGroup>
76-
<!-- Verify Cannot Add HTML Code to Stage Directly -->
76+
<!-- Verify Can Add HTML Code to Stage Directly -->
7777
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHTMLIntoContainer">
7878
<argument name="contentType" value="PageBuilderHtmlContentType"/>
7979
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>

0 commit comments

Comments
 (0)