Skip to content

Commit df75404

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

File tree

50 files changed

+60
-9
lines changed

Some content is hidden

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

50 files changed

+60
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
<argument name="block" value="$$createPreReqBlock$$"/>
6565
</actionGroup>
6666
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings" after="searchBlockInGrid"/>
67-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
68-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="saveEditPanelSettings"/>
67+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2" after="saveEditPanelSettings"/>
68+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="exitPageBuilderFullScreen2"/>
6969
<!-- Validate CMS Page Storefront -->
7070
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront">
7171
<argument name="page" value="$$createCMSPage.identifier$$"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<argument name="block" value="$$createPreReqBlock$$"/>
6161
</actionGroup>
6262
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings" after="searchBlockInGrid"/>
63-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
64-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="saveEditPanelSettings"/>
63+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2" after="saveEditPanelSettings"/>
64+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="exitPageBuilderFullScreen2"/>
6565
<!-- Validate CMS Page Storefront -->
6666
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront">
6767
<argument name="page" value="$$createCMSPage.identifier$$"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<argument name="block" value="$$createPreReqBlock$$"/>
5656
</actionGroup>
5757
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
58-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5958
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
6059
<!-- Validate CMS Page Storefront -->
6160
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<argument name="block" value="$$createPreReqBlock$$"/>
5858
</actionGroup>
5959
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
60-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6160
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
6261
<!-- Validate CMS Page Storefront -->
6362
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<argument name="block" value="$$createPreReqBlock$$"/>
5656
</actionGroup>
5757
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
58-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5958
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="saveEditPanelSettingsAfterBlock"/>
6059
<!-- Validate CMS Page Storefront -->
6160
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3434
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
</after>
36-
<seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
36+
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seeElementPageBuilderStage"/>
3737
<dontSeeElementInDOM selector="{{CmsNewPagePageContentSection.content}}" stepKey="dontSeeContentAreaInDOM"/>
3838
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
3939
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveButtonItemsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
</after>
4040
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
4141
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanelSettings1"/>
42+
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4243
<comment userInput="Save Product" stepKey="saveAndContinueEditCmsPage"/>
4344
<actionGroup ref="exitPageBuilderFullScreen" stepKey="switchToPageBuilderStage"/>
4445
<actionGroup ref="SaveProductFormActionGroup" after="switchToPageBuilderStage" stepKey="saveProduct"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveSlideItemsTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@
4040
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
4141
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanel1Settings"/>
4242
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditPanel1Settings2"/>
43+
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4344
<comment userInput="Save Product" stepKey="saveAndContinueEditCmsPage"/>
4445
<actionGroup ref="exitPageBuilderFullScreen" stepKey="switchToPageBuilderStage1"/>
4546
<actionGroup ref="SaveProductFormActionGroup" after="switchToPageBuilderStage1" stepKey="saveProduct"/>
4647
<waitForPageLoad after="saveProduct" stepKey="waitForPageLoadSaveProduct"/>
4748
<actionGroup ref="ExpandAdminProductSectionActionGroup" after="waitForPageLoadSaveProduct" stepKey="expandAdminProductSection"/>
4849
<actionGroup ref="openPageBuilderForAttribute" after="expandAdminProductSection" stepKey="openPageBuilderForDescription"/>
50+
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen2"/>
4951
<comment userInput="Save Product" stepKey="saveAndContinueEditCmsPage1"/>
5052
<actionGroup ref="exitPageBuilderFullScreen" stepKey="switchToPageBuilderStage2"/>
5153
<actionGroup ref="SaveProductFormActionGroup" after="switchToPageBuilderStage2" stepKey="saveProduct2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveTabItemsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
</after>
4040
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
4141
<comment userInput="Save Product" stepKey="commentSavePage"/>
42+
<comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
4243
<actionGroup ref="exitPageBuilderFullScreen" stepKey="saveAndContinueEditCmsPage"/>
4344
<actionGroup ref="SaveProductFormActionGroup" stepKey="switchToPageBuilderStage"/>
4445
<waitForPageLoad after="switchToPageBuilderStage" stepKey="waitForPageLoadSaveProduct"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
</after>
3838
<!-- Add Block -->
3939
<comment userInput="Add Block" stepKey="commentAddBlock"/>
40+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4041
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4142
<argument name="contentType" value="PageBuilderBlockContentType"/>
4243
</actionGroup>
@@ -64,6 +65,7 @@
6465
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
6566
<argument name="CMSPage" value="$$createCMSPage$$"/>
6667
</actionGroup>
68+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
6769
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
6870
<argument name="contentType" value="PageBuilderBlockContentType"/>
6971
</actionGroup>

0 commit comments

Comments
 (0)