Skip to content

Commit 5a36c34

Browse files
petrovsapetrovsa
committed
#429: User can add content to the Stage directly
 - fix PageBuilderCMSBlockAddContentDirectlyToStageTest - fix PageBuilderCMSPageAddContentDirectlyToStageTest - fix cannotDragContentTypeToTarget
1 parent 96197cc commit 5a36c34

File tree

3 files changed

+33
-90
lines changed

3 files changed

+33
-90
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
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"/>
19+
<argument name="contentSection" defaultValue="PageBuilderStage.editButtonSelector"/>
2020
</arguments>
2121
<scrollTo selector="{{contentSection}}" stepKey="scrollToTopOfStage"/>
2222
<waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForTargetActive"/>

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

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="CMS Block"/>
14-
<title value="Verify Can Only Add Expected Content Types to CMSBlock Stage Directly"/>
14+
<title value="Verify Can Only Add Expected Content Types to CMS Block Stage Directly"/>
1515
<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 CMS Block stage directly"/>
1616
<severity value="BLOCKER"/>
1717
<group value="pagebuilder"/>
@@ -25,76 +25,16 @@
2525
</actionGroup>
2626
</before>
2727
<after>
28-
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
28+
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock" after="deleteCMSPage"/>
2929
</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>
9030
<!-- Save CMS Block and Verify Expected Content Types on Stage -->
9131
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
9232
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlock" after="saveAndContinueEditCmsPage">
9333
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
9434
</actionGroup>
9535
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
9636
<!-- Navigate and insert CMSBlock to CMS Page -->
97-
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPageForBlock" after="dontSeeProductsAfterSave">
37+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPageForBlock" after="dontSeeProductsStageAfterSave">
9838
<argument name="CMSPage" value="$$createCMSPage$$"/>
9939
</actionGroup>
10040
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreenBlock" after="navigateToCreatedCMSPageForBlock"/>
@@ -115,7 +55,6 @@
11555
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBlock" after="saveEditPanelSettingsBlock"/>
11656
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageBlock" after="exitPageBuilderFullScreenBlock"/>
11757
<!-- Verify Expected Content Types on Storefront -->
118-
<executeJS function="return document.querySelectorAll(&quot;{{BlockOnStorefront.allBlocks}}&quot;).length" stepKey="numberOfBlockContentTypesStorefront"/>
11958
<assertEquals stepKey="assertBlockStorefront">
12059
<expectedResult type="int">2</expectedResult>
12160
<actualResult type="variable">numberOfBlockContentTypesStorefront</actualResult>

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

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="CMS Page"/>
14-
<title value="Verify Can Only Add Expected Content Types to Stage Directly"/>
15-
<description value="Verify user can add Row, Columns, Tabs, HTML Code, and Blocks to stage directly. Verify user cannot add any other content type to stage directly"/>
14+
<title value="Verify Can Only Add Expected Content Types to CMS Page Stage Directly"/>
15+
<description value="Verify user can add Row, Columns, Tabs, HTML Code, and Blocks to CMS Page stage directly. Verify user cannot add any other content type to CMS Page stage directly"/>
1616
<severity value="BLOCKER"/>
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-stage"/>
@@ -32,7 +32,7 @@
3232
</after>
3333
<!-- Verify Stage is Empty By Default -->
3434
<actionGroup ref="AdminVerifyEmptyStageActionGroup" stepKey="verifyStageEmpty"/>
35-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
35+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionLayout">
3636
<argument name="contentType" value="PageBuilderRowContentType"/>
3737
</actionGroup>
3838
<!-- Verify Can Add Row to Stage Directly -->
@@ -41,17 +41,19 @@
4141
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
4242
</actionGroup>
4343
<!-- Verify Can Add Column to Stage Directly -->
44-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragColumnIntoContainer">
44+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragColumnIntoContainer">
4545
<argument name="contentType" value="PageBuilderColumnContentType"/>
4646
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
47+
<argument name="dropZoneIndex" value="2"/>
4748
</actionGroup>
4849
<!-- Verify Can Add Tab to Stage Directly -->
49-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTabsIntoContainer">
50+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragTabsIntoContainer">
5051
<argument name="contentType" value="PageBuilderTabsContentType"/>
5152
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
53+
<argument name="dropZoneIndex" value="3"/>
5254
</actionGroup>
5355
<!-- Verify Cannot Add Text to Stage Directly -->
54-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionText">
56+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionElements">
5557
<argument name="contentType" value="PageBuilderTextContentType"/>
5658
</actionGroup>
5759
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragTextIntoStage">
@@ -74,9 +76,10 @@
7476
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
7577
</actionGroup>
7678
<!-- Verify Can Add HTML Code to Stage Directly -->
77-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHTMLIntoContainer">
79+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragHTMLIntoContainer">
7880
<argument name="contentType" value="PageBuilderHtmlContentType"/>
7981
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
82+
<argument name="dropZoneIndex" value="4"/>
8083
</actionGroup>
8184
<!-- Verify Cannot Add Video to Stage Directly -->
8285
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionMedia">
@@ -107,12 +110,13 @@
107110
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
108111
</actionGroup>
109112
<!-- Verify Can Add Block to Stage Directly -->
110-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionContent">
113+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionAddContent">
111114
<argument name="contentType" value="PageBuilderBlockContentType"/>
112115
</actionGroup>
113-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBlockIntoContainer">
116+
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragBlockIntoContainer">
114117
<argument name="contentType" value="PageBuilderBlockContentType"/>
115118
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
119+
<argument name="dropZoneIndex" value="5"/>
116120
</actionGroup>
117121
<!-- Verify Cannot Add Products to Stage Directly -->
118122
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragProductsIntoStage">
@@ -124,30 +128,30 @@
124128
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
125129
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
126130
<seeNumberOfElements selector="{{RowOnStage.allRows}}" userInput="1" stepKey="seeOneRowStageAfterSave"/>
127-
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="seeColumnAfterSave"/>
128-
<seeNumberOfElements selector="{{TabOnStage.all}}" userInput="1" stepKey="seeTabsAfterSave"/>
129-
<executeJS function="return document.querySelectorAll(&quot;{{HtmlOnStage.allHtml}}&quot;).length" stepKey="numberOfHTMLContentTypesAfterSave"/>
131+
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="seeTwoColumnsStageAfterSave"/>
132+
<seeNumberOfElements selector="{{TabOnStage.all}}" userInput="1" stepKey="seeOneTabStageAfterSave"/>
133+
<executeJS function="return document.querySelectorAll(&quot;{{HtmlOnStage.allHtml}}&quot;).length" stepKey="numberOfHTMLContentTypesStageAfterSave"/>
130134
<assertEquals stepKey="assertHTMLStage">
131135
<expectedResult type="int">1</expectedResult>
132-
<actualResult type="variable">numberOfHTMLContentTypesAfterSave</actualResult>
136+
<actualResult type="variable">numberOfHTMLContentTypesStageAfterSave</actualResult>
133137
</assertEquals>
134138
<executeJS function="return document.querySelectorAll(&quot;{{BlockOnStage.allBlocks}}&quot;).length" stepKey="numberOfBlockContentTypesStageAfterSave"/>
135139
<assertEquals stepKey="assertBlockStage">
136140
<expectedResult type="int">1</expectedResult>
137141
<actualResult type="variable">numberOfBlockContentTypesStageAfterSave</actualResult>
138142
</assertEquals>
139-
<dontSeeElementInDOM selector="{{TextOnStage.allText}}" stepKey="dontSeeTextAfterSave"/>
140-
<dontSeeElementInDOM selector="{{HeadingOnStage.all}}" stepKey="dontSeeHeadingAfterSave"/>
141-
<dontSeeElementInDOM selector="{{ButtonGroupOnStage.allButtons}}" stepKey="dontSeeButtonGroupAfterSave"/>
142-
<dontSeeElementInDOM selector="{{DividerOnStage.allDividers}}" stepKey="dontSeeDividerAfterSave"/>
143-
<dontSeeElementInDOM selector="{{VideoOnStage.allVideo}}" stepKey="dontSeeVideoAfterSave"/>
144-
<dontSeeElementInDOM selector="{{ImageOnStage.allImages}}" stepKey="dontSeeImageAfterSave"/>
145-
<dontSeeElementInDOM selector="{{MapOnStage.allMaps}}" stepKey="dontSeeMapAfterSave"/>
146-
<dontSeeElementInDOM selector="{{SliderOnStage.all}}" stepKey="dontSeeSliderAfterSave"/>
147-
<dontSeeElementInDOM selector="{{BannerOnBackend.allBanners}}" stepKey="dontSeeBannerAfterSave"/>
148-
<dontSeeElementInDOM selector="{{ProductsOnStage.allProducts}}" stepKey="dontSeeProductsAfterSave"/>
143+
<dontSeeElementInDOM selector="{{TextOnStage.allText}}" stepKey="dontSeeTextStageAfterSave"/>
144+
<dontSeeElementInDOM selector="{{HeadingOnStage.all}}" stepKey="dontSeeHeadingStageAfterSave"/>
145+
<dontSeeElementInDOM selector="{{ButtonGroupOnStage.allButtons}}" stepKey="dontSeeButtonGroupStageAfterSave"/>
146+
<dontSeeElementInDOM selector="{{DividerOnStage.allDividers}}" stepKey="dontSeeDividerStageAfterSave"/>
147+
<dontSeeElementInDOM selector="{{VideoOnStage.allVideo}}" stepKey="dontSeeVideoStageAfterSave"/>
148+
<dontSeeElementInDOM selector="{{ImageOnStage.allImages}}" stepKey="dontSeeImageStageAfterSave"/>
149+
<dontSeeElementInDOM selector="{{MapOnStage.allMaps}}" stepKey="dontSeeMapAfterStageSave"/>
150+
<dontSeeElementInDOM selector="{{SliderOnStage.all}}" stepKey="dontSeeSliderStageAfterSave"/>
151+
<dontSeeElementInDOM selector="{{BannerOnBackend.allBanners}}" stepKey="dontSeeBannerStageAfterSave"/>
152+
<dontSeeElementInDOM selector="{{ProductsOnStage.allProducts}}" stepKey="dontSeeProductsStageAfterSave"/>
149153
<!-- Verify Expected Content Types on Storefront -->
150-
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront4">
154+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
151155
<argument name="page" value="$$createCMSPage.identifier$$"/>
152156
</actionGroup>
153157
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="1" stepKey="seeOneRowStorefront"/>
@@ -168,7 +172,7 @@
168172
<dontSeeElementInDOM selector="{{ButtonGroupOnStorefront.allButtons}}" stepKey="dontSeeButtonGroupStorefront"/>
169173
<dontSeeElementInDOM selector="{{DividerOnStorefront.allDividers}}" stepKey="dontSeeDividerStorefront"/>
170174
<dontSeeElementInDOM selector="{{VideoOnStorefront.allVideo}}" stepKey="dontSeeVideoStorefront"/>
171-
<dontSeeElementInDOM selector="{{ImageOnStorefront.allImages}}" stepKey="notSeeImageOnStorefront"/>
175+
<dontSeeElementInDOM selector="{{ImageOnStorefront.allImages}}" stepKey="dontSeeImageOnStorefront"/>
172176
<dontSeeElementInDOM selector="{{MapOnStorefront.allMaps}}" stepKey="dontSeeMapStorefront"/>
173177
<dontSeeElementInDOM selector="{{SlideOnFrontend.all}}" stepKey="dontSeeSliderOnFrontend"/>
174178
<dontSeeElementInDOM selector="{{BannerOnFrontend.allBanners}}" stepKey="dontSeeBannerStorefront"/>

0 commit comments

Comments
 (0)