Skip to content

Commit 7fe07f2

Browse files
omiroshnichenkoomiroshnichenko
committed
#510: User edits CMS page content in full-screen mode only
- fix mftf tests
1 parent 96a6db8 commit 7fe07f2

File tree

74 files changed

+89
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+89
-49
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
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"/>
3738
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3839
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
3940
<!-- Go to CMS Page and choose Block -->

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
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"/>
3738
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3839
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage1"/>
40+
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen2"/>
3941
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage1"/>
4042
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage2"/>
4143
<!-- Go to CMS Page and choose Block -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
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"/>
3738
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3839
<comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
3940
<!-- Go to CMS Page and choose Block -->

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
3434
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
3535
</actionGroup>
36-
<waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderDisplay"/>
36+
<actionGroup ref="switchToPageBuilderStage" stepKey="waitForPageBuilderDisplay"/>
3737
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3838
<argument name="contentType" value="PageBuilderTextContentType"/>
3939
</actionGroup>
@@ -46,12 +46,14 @@
4646
<waitForLoadingMaskToDisappear stepKey="waitForEditPanelSpinner"/>
4747
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello CMS Page from PageBuilder" stepKey="addTextToEditor"/>
4848
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
49+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
4950
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="saveCMSWithPageBuilderContent"/>
5051
<!--Enable WYSIWYG-->
5152
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
5253
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage2">
5354
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
5455
</actionGroup>
56+
<actionGroup ref="switchToPageBuilderStage" stepKey="waitForPageBuilderDisplay2"/>
5557
<actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="verifyPageBuilderVisibleOnCMSPage"/>
5658
</test>
5759
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
</after>
4141
<!-- Add Banner -->
4242
<comment userInput="Add Banner" stepKey="commentAddBanner"/>
43+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4344
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4445
<argument name="contentType" value="PageBuilderBannerContentType"/>
4546
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
2727
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
2828
</actionGroup>
29+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2930
</before>
3031
<after>
3132
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
</after>
5252
<!-- Add Products -->
5353
<comment userInput="Add Products" stepKey="commentAddProducts"/>
54-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
5554
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
5655
<argument name="contentType" value="PageBuilderProductsContentType"/>
5756
</actionGroup>
@@ -88,7 +87,7 @@
8887
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
8988
<argument name="CMSPage" value="$$createCMSPage$$"/>
9089
</actionGroup>
91-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
90+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
9291
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
9392
<argument name="contentType" value="PageBuilderBlockContentType"/>
9493
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
</after>
4444
<!-- Add HTML -->
4545
<comment userInput="Add HTML" stepKey="commentAddHTML"/>
46-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4746
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4847
<argument name="contentType" value="PageBuilderHtmlContentType"/>
4948
</actionGroup>
@@ -104,7 +103,7 @@
104103
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
105104
<argument name="CMSPage" value="$$createCMSPage$$"/>
106105
</actionGroup>
107-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
106+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
108107
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
109108
<argument name="contentType" value="PageBuilderBlockContentType"/>
110109
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</actionGroup>
3737
<!-- Update block with text -->
3838
<comment userInput="Update block with text" stepKey="commentUpdateBlockWithText"/>
39-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4039
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText1">
4140
<argument name="contentType" value="PageBuilderTextContentType"/>
4241
</actionGroup>
@@ -47,7 +46,6 @@
4746
<argument name="contentType" value="PageBuilderTextContentType"/>
4847
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
4948
</actionGroup>
50-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5149
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveBlock"/>
5250
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCmsPage">
5351
<argument name="CMSPage" value="$$createCMSPage$$"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
114114
<argument name="CMSPage" value="$$createCMSPage$$"/>
115115
</actionGroup>
116+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
116117
<!-- Edit Row On CMS Page -->
117118
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRowCMSPage">
118119
<argument name="contentType" value="PageBuilderRowContentType"/>

0 commit comments

Comments
 (0)