Skip to content

Commit 0930b99

Browse files
omiroshnichenkoomiroshnichenko
committed
#510: User edits CMS page content in full-screen mode only - #6 added changes for the cms staging mode
- remove form
1 parent eadc443 commit 0930b99

10 files changed

+13
-13
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35+
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3536
</test>
3637
</tests>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35+
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3536
</test>
3637
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3535
</after>
3636
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
37-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
3837
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3938
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
4039
<!-- Go to CMS Page and choose Block -->
@@ -56,7 +55,8 @@
5655
<argument name="block" value="$$createPreReqBlock$$"/>
5756
</actionGroup>
5857
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
59-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
59+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
6060
<!-- Validate CMS Page Storefront -->
6161
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
6262
<argument name="page" value="$$createCMSPage.identifier$$"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3535
</after>
3636
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
37-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
3837
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3938
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage1"/>
4039
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen2"/>
@@ -59,7 +58,8 @@
5958
<argument name="block" value="$$createPreReqBlock$$"/>
6059
</actionGroup>
6160
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
62-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
61+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
62+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
6363
<!-- Validate CMS Page Storefront -->
6464
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
6565
<argument name="page" value="$$createCMSPage.identifier$$"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3535
</after>
3636
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
37-
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
3837
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3938
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
4039
<!-- Go to CMS Page and choose Block -->
@@ -56,7 +55,8 @@
5655
<argument name="block" value="$$createPreReqBlock$$"/>
5756
</actionGroup>
5857
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
59-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
59+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
6060
<!-- Validate CMS Page Storefront -->
6161
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
6262
<argument name="page" value="$$createCMSPage.identifier$$"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
5252
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
5353
</actionGroup>
54+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5455
<!-- Use Full Width layout -->
5556
<comment userInput="Set Layout to Page - Full Width" stepKey="commentSetLayout"/>
5657
<actionGroup ref="SetLayoutActionGroup" stepKey="setFullWidthLayout">
5758
<argument name="designSection" value="CmsDesignSection"/>
5859
<argument name="layoutOption" value="PageBuilderFullWidthLayout.cms"/>
5960
</actionGroup>
60-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6161
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6262
<!-- Check that content is full width on storefront -->
6363
<comment userInput="Check that content is full width on storefront" stepKey="commentSeeDescriptionFullWidth"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
5353
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
5454
</actionGroup>
55+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5556
<!-- Use Category - Full Width layout -->
5657
<comment userInput="Set Layout to Category - Full Width" stepKey="commentSetLayout"/>
5758
<actionGroup ref="SetLayoutActionGroup" stepKey="setCategoryFullWidthLayout">
5859
<argument name="designSection" value="CmsDesignSection"/>
5960
<argument name="layoutOption" value="PageBuilderFullWidthLayout.category"/>
6061
</actionGroup>
61-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6262
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6363
<!-- Check that content is displayed on storefront with the category full width layout -->
6464
<comment userInput="Check that content is displayed on storefront with the product full width layout" stepKey="commentSeeContent"/>
@@ -74,7 +74,6 @@
7474
<argument name="designSection" value="CmsDesignSection"/>
7575
<argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
7676
</actionGroup>
77-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
7877
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
7978
<!-- Check that content is displayed on storefront with the product full width layout -->
8079
<comment userInput="Check that content is displayed on storefront with the product full width layout" stepKey="commentSeeContent2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderBlockThroughBlockContentTypeTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</after>
3838
<!-- Add Block -->
3939
<comment userInput="Add Block" stepKey="commentAddBlock"/>
40-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4140
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4241
<argument name="contentType" value="PageBuilderBlockContentType"/>
4342
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCanAddAndEditContentTypesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
6262
<!-- Validate Stage After Save -->
6363
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
64-
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStageAfterSave"/>
65-
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreenAfterSave"/>
64+
<comment userInput="seeButtonTextStageAfterSave" stepKey="seeButtonTextStageAfterSave"/>
65+
<comment userInput="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreenAfterSave"/>
6666
<!-- Validate Full-Screen Stage -->
6767
<comment userInput="Validate Full-Screen Stage" stepKey="commentValidateFullScreenStageAfterSave"/>
6868
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStageFullScreenAfterSave"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingOptionsMenuNotOverflowRightTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</assertLessThanOrEqual>
102102
<!-- Set PageBuilder to full screen -->
103103
<comment userInput="Set PageBuilder to full screen" stepKey="commentSetFullScreen"/>
104-
<actionGroup ref="openPageBuilderFullScreen" stepKey="openFullScreen"/>
104+
<comment userInput="openPageBuilderFullScreen" stepKey="openFullScreen"/>
105105
<waitForElementVisible selector="{{HeadingOnStage.base('1')}}" stepKey="waitForContentTypeToBeVisible"/>
106106
<!-- Assert heading options menu did not overflow -->
107107
<comment userInput="Assert heading options menu did not overflow" stepKey="commentAssertHeadingOptionMenuNotOverflowFullScreen"/>

0 commit comments

Comments
 (0)