Skip to content

Commit 92655b0

Browse files
bluemwhitewbluemwhitew
committed
#544: Configurable Page Builder Full Screen Mode
- Extending Common Tests (MFTF) - Extending `PageBuilderStage` Selectors - Refactoring `ValidatePageBuilderPreviewActionGroup` (Case Correction)
1 parent 09662ac commit 92655b0

File tree

6 files changed

+117
-7
lines changed

6 files changed

+117
-7
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminSetPageBuilderContentPreviewActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="adminSetPageBuilderContentPreviewActionGroup">
10+
<annotations>
11+
<description>Sets "Enable Page Builder Content Preview" flag value.</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="enablePageBuilderContentPreview" defaultValue="1" type="string"/>
15+
</arguments>
16+
<magentoCLI command="config:set cms/pagebuilder/enable_content_preview {{enablePageBuilderContentPreview}}" stepKey="setConfig"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidatePageBuilderPreviewActionGroup">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="validatePageBuilderPreviewActionGroup">
1110
<annotations>
1211
<description>Verifies Page Builder preview has the 'Edit with Page Builder' button, has an overlay, does not have the Page Builder left panel, does not have the Page Builder template buttons, and does not open content type option menus.</description>
1312
</annotations>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
109
<section name="PageBuilderStage">
1110
<element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
1211
<element name="applyTemplateButton" type="button" selector="//button[contains(@data-bind,'toggleTemplateManger') and text()='Apply Template']"/>
@@ -19,6 +18,7 @@
1918
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
2019
<element name="disabled" type="button" selector="//div[contains(@class, '_disabled')]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
2120
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
21+
<element name="stageSnapshot" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-wrapper') and contains(@class, 'pagebuilder-wysiwyg-snapshot')]"/>
2222
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
2323
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
2424
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCategoryDisablePageBuilderStageTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="PageBuilderCategoryDisablePageBuilderStageTest">
10+
<annotations>
11+
<features value="PageBuilder"/>
12+
<stories value="Catalog Category"/>
13+
<title value="Category - Validate Toggling Page Builder Content Preview"/>
14+
<description value="Ensures that Page Builder content staging can be enabled/disabled for Edit Category pages via the Enable Page Builder Content Preview flag."/>
15+
<severity value="AVERAGE"/>
16+
<group value="pagebuilder"/>
17+
<group value="pagebuilder-disable"/>
18+
<group value="pagebuilder-catalog-category"/>
19+
</annotations>
20+
<before>
21+
<createData entity="_defaultCategory" stepKey="createCategory"/>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
24+
<argument name="Category" value="$$createCategory$$"/>
25+
</actionGroup>
26+
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
27+
</before>
28+
<after>
29+
<magentoCLI command="config:set cms/pagebuilder/enable_content_preview 1" stepKey="enablePageBuilderContentPreview"/>
30+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
31+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
32+
</after>
33+
<!-- Verify (Enabled) Content Preview -->
34+
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="validatePageBuilderPreviewActionGroup"/>
35+
<seeElementInDOM selector="{{PageBuilderStage.stageSnapshot}}" stepKey="seeStageSnapshot"/>
36+
<!-- Verify (Disabled) Content Preview -->
37+
<actionGroup ref="adminSetPageBuilderContentPreviewActionGroup" stepKey="disablePageBuilderContentPreview">
38+
<argument name="enablePageBuilderContentPreview" value="0"/>
39+
</actionGroup>
40+
<reloadPage stepKey="reloadPage"/>
41+
<waitForPageLoad stepKey="waitForPageLoad"/>
42+
<dontSeeElementInDOM selector="{{PageBuilderStage.stageSnapshot}}" stepKey="dontSeeStageSnapshot"/>
43+
</test>
44+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderStageTest.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="PageBuilderProductDisablePageBuilderStageTest">
10+
<annotations>
11+
<features value="PageBuilder"/>
12+
<stories value="Catalog Product"/>
13+
<title value="Product - Validate Toggling Page Builder Content Preview"/>
14+
<description value="Ensures that Page Builder content staging can be enabled/disabled for Edit Product pages via the Enable Page Builder Content Preview flag."/>
15+
<severity value="AVERAGE"/>
16+
<group value="pagebuilder"/>
17+
<group value="pagebuilder-disable"/>
18+
<group value="pagebuilder-catalog-product"/>
19+
</annotations>
20+
<before>
21+
<createData entity="_defaultCategory" stepKey="createCategory"/>
22+
<createData entity="_defaultProduct" stepKey="createProduct">
23+
<requiredEntity createDataKey="createCategory"/>
24+
</createData>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="navigateToCreatedProductEditPage">
27+
<argument name="product" value="$$createProduct$$"/>
28+
</actionGroup>
29+
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
30+
</before>
31+
<after>
32+
<magentoCLI command="config:set cms/pagebuilder/enable_content_preview 1" stepKey="enablePageBuilderContentPreview"/>
33+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
34+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
35+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
36+
</after>
37+
<!-- Verify (Enabled) Content Preview -->
38+
<actionGroup ref="validatePageBuilderPreviewActionGroup" stepKey="validatePageBuilderPreviewActionGroup"/>
39+
<seeElementInDOM selector="{{PageBuilderStage.stageSnapshot}}" stepKey="seeStageSnapshot"/>
40+
<!-- Verify (Disabled) Content Preview -->
41+
<actionGroup ref="adminSetPageBuilderContentPreviewActionGroup" stepKey="disablePageBuilderContentPreview">
42+
<argument name="enablePageBuilderContentPreview" value="0"/>
43+
</actionGroup>
44+
<reloadPage stepKey="reloadPage"/>
45+
<waitForPageLoad stepKey="waitForPageLoad"/>
46+
<dontSeeElementInDOM selector="{{PageBuilderStage.stageSnapshot}}" stepKey="dontSeeStageSnapshot"/>
47+
</test>
48+
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333
<!-- Verify Page Builder preview is ready -->
34-
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreview"/>
34+
<actionGroup ref="validatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreview"/>
3535
<!-- Verify Empty Row -->
3636
<actionGroup ref="verifyEmptyStage" stepKey="verifyPreviewEmptyRow"/>
3737
<!-- Open Page Builder Full Screen -->
@@ -55,7 +55,7 @@
5555
<!-- Verify no Empty Preview Message on Stage -->
5656
<dontSeeElementInDOM selector="{{RowOnStage.empty('1')}}" stepKey="dontSeeEmptyRowOnPreview"/>
5757
<!-- Verify Page Builder preview is ready -->
58-
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
58+
<actionGroup ref="validatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
5959
<!-- Verify Page Builder Full Screen -->
6060
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen2"/>
6161
</test>

0 commit comments

Comments
 (0)