Skip to content

Commit 29d1a3f

Browse files
author
Lukasz Borowiec
committed
#510: User sees content snapshot on CMS page in Admin Panel #7 - Merged the product branch
2 parents 8541f9a + 1957e73 commit 29d1a3f

File tree

6 files changed

+35
-28
lines changed

6 files changed

+35
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="ValidatePageBuilderPreviewActionGroup">
10+
<actionGroup name="validatePageBuilderPreviewActionGroup">
1111
<annotations>
1212
<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>
1313
</annotations>

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="PageBuilderPanel">
11-
<element name="leftPanel" type="input" selector="#pagebuilder-panel"/>
12-
<element name="searchField" type="input" selector="//*[@id=&quot;pagebuilder-panel&quot;]/div[1]/a"/>
13-
<element name="clearSearch" type="button" selector="//*[@id=&quot;pagebuilder-panel&quot;]/div[1]/a"/>
14-
<element name="firstSection" type="button" selector="//*[@id=&quot;pagebuilder-panel-menu-sections&quot;]/li[1]" timeout="30"/>
15-
<element name="allPanelMenuSections" type="button" selector="#pagebuilder-panel-menu-sections .menu-section-title"/>
16-
<element name="allMenuSectionContentTypes" type="button" selector="#pagebuilder-panel-menu-sections #menu-section-{{arg1}} .pagebuilder-draggable-content-type" parameterized="true"/>
17-
<element name="panelMenuSection" type="button" selector="//div[@id='pagebuilder-panel']//h4[.='{{arg1}}']" parameterized="true"/>
18-
<element name="panelMenuSectionActive" type="button" selector="//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='{{arg1}}']" parameterized="true"/>
19-
<element name="layoutMenuSection" type="button" selector="//*[@id=&quot;menu-section-layout&quot;]" timeout="10"/>
20-
<element name="layoutMenuSectionContentType" type="button" selector="//*[@id=&quot;menu-section-layout&quot;]/div/div/ul/li/a/span[2]"/>
21-
<element name="elementsMenuSection" type="button" selector="//*[@id=&quot;menu-section-elements&quot;]"/>
22-
<element name="elementsMenuSectionContentType" type="button" selector="//*[@id=&quot;menu-section-elements&quot;]/div/div/ul/li/a/span[2]"/>
23-
<element name="mediaMenuSection" type="button" selector="//*[@id=&quot;menu-section-media&quot;]"/>
24-
<element name="mediaMenuSectionContentType" type="button" selector="//*[@id=&quot;menu-section-media&quot;]/div/div/ul/li/a/span[2]"/>
25-
<element name="addContentMenuSection" type="button" selector="//*[@id=&quot;menu-section-add_content&quot;]"/>
26-
<element name="addContentMenuSectionContentType" type="button" selector="//*[@id=&quot;menu-section-add_content&quot;]/div/div/ul/li/a/span[2]"/>
27-
<element name="searchPanel" type="input" selector="//*[@id=&quot;search-content-types-input&quot;]" timeout="30"/>
28-
<element name="searchResults" type="text" selector="//*[@id=&quot;search-results&quot;]" timeout="30"/>
29-
<element name="nothingFound" type="text" selector="//*[@id=&quot;pagebuilder-panel&quot;]/div[2]/div" timeout="30"/>
30-
<element name="draggableContentTypeInPanel" type="button" selector="//*[text()=&quot;{{arg1}}&quot;]/ancestor::*[contains(@class, &quot;ui-draggable&quot;)]" parameterized="true"/>
31-
<element name="contentTypeInMenuSection" type="button" selector="//ul[@class='pagebuilder-panel-menu-sections']//li[{{arg1}}]//h4[.='{{arg2}}']/../..//ul//li[{{arg3}}]//span[text()='{{arg4}}']" parameterized="true"/>
32-
<element name="contentTypeWithIcon" type="button" selector="//ul[@class='pagebuilder-panel-menu-sections']//span[@class='content-type-icon']//i[@class='icon-pagebuilder-{{arg2}}']/../following-sibling::span[text()='{{arg1}}']" parameterized="true"/>
11+
<element name="leftPanel" type="input" selector=".stage-is-active #pagebuilder-panel"/>
12+
<element name="searchField" type="input" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;pagebuilder-panel&quot;]/div[1]/a"/>
13+
<element name="clearSearch" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;pagebuilder-panel&quot;]/div[1]/a"/>
14+
<element name="firstSection" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;pagebuilder-panel-menu-sections&quot;]/li[1]" timeout="30"/>
15+
<element name="allPanelMenuSections" type="button" selector=".stage-is-active #pagebuilder-panel-menu-sections .menu-section-title"/>
16+
<element name="allMenuSectionContentTypes" type="button" selector=".stage-is-active #pagebuilder-panel-menu-sections #menu-section-{{arg1}} .pagebuilder-draggable-content-type" parameterized="true"/>
17+
<element name="panelMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//h4[.='{{arg1}}']" parameterized="true"/>
18+
<element name="panelMenuSectionActive" type="button" selector="//div[contains(@class,'stage-is-active')]//div[@id='pagebuilder-panel']//li[@class='active']//h4[.='{{arg1}}']" parameterized="true"/>
19+
<element name="layoutMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-layout&quot;]" timeout="10"/>
20+
<element name="layoutMenuSectionContentType" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-layout&quot;]/div/div/ul/li/a/span[2]"/>
21+
<element name="elementsMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-elements&quot;]"/>
22+
<element name="elementsMenuSectionContentType" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-elements&quot;]/div/div/ul/li/a/span[2]"/>
23+
<element name="mediaMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-media&quot;]"/>
24+
<element name="mediaMenuSectionContentType" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-media&quot;]/div/div/ul/li/a/span[2]"/>
25+
<element name="addContentMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-add_content&quot;]"/>
26+
<element name="addContentMenuSectionContentType" type="button" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;menu-section-add_content&quot;]/div/div/ul/li/a/span[2]"/>
27+
<element name="searchPanel" type="input" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;search-content-types-input&quot;]" timeout="30"/>
28+
<element name="searchResults" type="text" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;search-results&quot;]" timeout="30"/>
29+
<element name="nothingFound" type="text" selector="//div[contains(@class,'stage-is-active')]//*[@id=&quot;pagebuilder-panel&quot;]/div[2]/div" timeout="30"/>
30+
<element name="draggableContentTypeInPanel" type="button" selector="//div[contains(@class,'stage-is-active')]//*[text()=&quot;{{arg1}}&quot;]/ancestor::*[contains(@class, &quot;ui-draggable&quot;)]" parameterized="true"/>
31+
<element name="contentTypeInMenuSection" type="button" selector="//div[contains(@class,'stage-is-active')]//ul[@class='pagebuilder-panel-menu-sections']//li[{{arg1}}]//h4[.='{{arg2}}']/../..//ul//li[{{arg3}}]//span[text()='{{arg4}}']" parameterized="true"/>
32+
<element name="contentTypeWithIcon" type="button" selector="//div[contains(@class,'stage-is-active')]//ul[@class='pagebuilder-panel-menu-sections']//span[@class='content-type-icon']//i[@class='icon-pagebuilder-{{arg2}}']/../following-sibling::span[text()='{{arg1}}']" parameterized="true"/>
3333
</section>
3434
</sections>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<element name="editButtonSelector" type="button" selector="//button/span[contains(text(), 'Edit with Page Builder')]"/>
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']"/>
23-
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
23+
<element name="stagePreview" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper') and not(contains(@class, 'stage-full-screen'))]"/>
24+
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-is-active.stage-full-screen"/>
2425
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
2526
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
2627
<element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>

‎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>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ActivatePageBuilderFullScreenTest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="ActivatePageBuilderFullScreenTest">
1111
<annotations>
1212
<features value="PageBuilder"/>
@@ -22,22 +22,28 @@
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
25+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2526
<waitForElement time="5" selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForElement"/>
2627
<waitForElementVisible time="5" selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForHeaderVisible"/>
2728
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="switchToPageBuilderStage"/>
2829
</before>
2930
<after>
3031
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3132
</after>
33+
<waitForElementVisible selector="{{PageBuilderStage.stageWrapper}}" stepKey="waitForStage"/>
34+
<waitForElementVisible selector="{{PageBuilderStage.openFullScreen}}" stepKey="waitForFullScreenButton"/>
3235
<waitForElementVisible selector="{{PageBuilderStage.snapshot}}" stepKey="waitForStage"/>
3336
<waitForElementVisible selector="{{PageBuilderStage.editButtonSelector}}" stepKey="waitForFullScreenButton"/>
3437
<waitForElementNotVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="verifyStageNotFullScreen"/>
38+
<click selector="{{PageBuilderStage.openFullScreen}}" stepKey="clickFullScreenButton"/>
3539
<click selector="{{PageBuilderStage.editButtonSelector}}" stepKey="clickFullScreenButton"/>
3640
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>
3741
<waitForElementVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="waitForStageFullScreen"/>
3842
<waitForElementVisible selector="{{PageBuilderStage.exitFullScreen}}" stepKey="waitForExitFullScreenButton"/>
43+
<waitForElementNotVisible selector="{{PageBuilderStage.stageWrapper}}" stepKey="verifyStageNotNormalScreen"/>
3944
<waitForElementNotVisible selector="{{PageBuilderStage.snapshot}}" stepKey="verifyStageNotNormalScreen"/>
4045
<click selector="{{PageBuilderStage.exitFullScreen}}" stepKey="clickExitFullScreen"/>
46+
<waitForElementVisible selector="{{PageBuilderStage.stageWrapper}}" stepKey="waitForStage2"/>
4147
<waitForElementVisible selector="{{PageBuilderStage.snapshot}}" stepKey="waitForStage2"/>
4248
<waitForElementNotVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="verifyStageNotFullScreen2"/>
4349
</test>

‎app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77
<div class="pagebuilder-stage-wrapper"
8-
css="'stage-full-screen': isFullScreen, 'stage-content-snapshot': isSnapshot, 'transition-out': isSnapshotTransition"
8+
css="'stage-full-screen': isFullScreen, 'stage-content-snapshot': isSnapshot, 'transition-out': isSnapshotTransition, 'stage-is-active': (!isSnapshot() || isFullScreen)"
99
ko-style="wrapperStyles">
1010
<div class="admin__field pagebuilder-header"
1111
css="visible: panel.isVisible(), 'transition-out': isSnapshotTransition()"

0 commit comments

Comments
 (0)