Skip to content

Commit b11665a

Browse files
hannahnidahannahnida
committed
Merge branch '512_content-snapshot-block-admin-page' of github:magento/magento2-page-builder into 513_content-snapshot-dynamic-block
2 parents 9a2bd94 + df31ed7 commit b11665a

File tree

6 files changed

+104
-8
lines changed

6 files changed

+104
-8
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
<annotations>
1212
<description>Click Page Builder preview overlay to open Page Builder stage.</description>
1313
</annotations>
14-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
15-
<click selector="{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
14+
<arguments>
15+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
16+
</arguments>
17+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
1619
<waitForPageLoad stepKey="waitForPageLoadPageBuilder"/>
17-
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
20+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
1821
<waitForElementVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="waitForPageBuilderFullScreen"/>
1922
</actionGroup>
2023
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<dontSeeElement selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
2020
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="dontSeePageBuilderApplyTemplateButton"/>
2121
<dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.saveAsTemplateButton}}" stepKey="dontSeePageBuilderSaveAsTemplateButton"/>
22-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23-
<moveMouseOver selector="{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24-
<waitForElementVisible selector="{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
22+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
23+
<moveMouseOver selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
24+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
2525
<dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="dontSeeRowOptionMenu"/>
2626
</actionGroup>
2727
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
2222
<element name="disabled" type="button" selector="//div[contains(@class, '_disabled')]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
2323
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
24-
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
25-
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
24+
<element name="stageOverlay" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay')]"/>
25+
<element name="stageOverlayOnHover" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay') and contains(@class, '_hover')]"/>
2626
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>
2727
<element name="modal" type="text" selector="aside.modal-popup._show"/>
2828
<element name="modalOk" type="button" selector="aside.modal-popup._show button.action-primary.action-accept"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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="PageBuilderCmsBlockContentSnapshotTest" extends="PageBuilderCatalogCategoryContentSnapshotTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Content Snapshot"/>
14+
<title value="CMS Block - Verify PageBuilder Content Snapshot"/>
15+
<description value="This test is to ensure that the PageBuilder Content Snapshot appears on stage in Cms Block Admin Page and PageBuilder works in full-screen mode."/>
16+
<severity value="MAJOR"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-contentSnapshot"/>
19+
<group value="pagebuilder-cms-block"/>
20+
</annotations>
21+
<before>
22+
<comment userInput="---merging to remove step---" stepKey="createPreReqCategory"/>
23+
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock" before="navigateToAPageWithPageBuilder"/>
24+
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
25+
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
26+
</actionGroup>
27+
<comment userInput="---merging to remove step---" stepKey="expandContentSection"/>
28+
</before>
29+
<after>
30+
<comment userInput="---merging to remove step---" stepKey="deleteCreatedCategory"/>
31+
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock" before="logout"/>
32+
</after>
33+
</test>
34+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="PageBuilderCmsPageContentSnapshotTest" extends="PageBuilderCatalogCategoryContentSnapshotTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Content Snapshot"/>
14+
<title value="CMS Page - Verify PageBuilder Content Snapshot"/>
15+
<description value="This test is to ensure that the PageBuilder Content Snapshot appears on stage in Cms Page Admin Page and PageBuilder works in full-screen mode."/>
16+
<severity value="MAJOR"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-contentSnapshot"/>
19+
<group value="pagebuilder-cms-page"/>
20+
</annotations>
21+
<before>
22+
<comment userInput="---merging to remove step---" stepKey="createPreReqCategory"/>
23+
<createData entity="_emptyCmsPage" stepKey="createCMSPage" before="navigateToAPageWithPageBuilder"/>
24+
<actionGroup ref="navigateToCMSPage" stepKey="navigateToAPageWithPageBuilder">
25+
<argument name="CMSPage" value="$$createCMSPage$$"/>
26+
</actionGroup>
27+
</before>
28+
<after>
29+
<comment userInput="---merging to remove step---" stepKey="deleteCreatedCategory"/>
30+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" before="logout"/>
31+
</after>
32+
</test>
33+
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/cms_block_form.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<fieldset name="general">
10+
<field name="content" formElement="wysiwyg">
11+
<argument name="data" xsi:type="array">
12+
<item name="config" xsi:type="array">
13+
<item name="wysiwygConfigData" xsi:type="array">
14+
<item name="pagebuilder_content_snapshot" xsi:type="boolean">true</item>
15+
<item name="pagebuilder_button" xsi:type="boolean">true</item>
16+
</item>
17+
</item>
18+
</argument>
19+
<settings>
20+
<additionalClasses>
21+
<class name="admin__field-wide admin__field-page-builder">true</class>
22+
</additionalClasses>
23+
</settings>
24+
</field>
25+
</fieldset>
26+
</form>

0 commit comments

Comments
 (0)