Skip to content

Commit 6306983

Browse files
author
Lukasz Borowiec
committed
Merge branch '512_content-snapshot-block-admin-page' of github.com:magento/magento2-page-builder into 512_content-snapshot-block-admin-page
2 parents 28afdcd + 99c7c25 commit 6306983

6 files changed

+24
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3535
</after>
3636
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
37-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3837
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
38+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage" after="exitPageBuilderFullScreen"/>
3939
<!-- Go to CMS Page and choose Block -->
4040
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeTab2NameStageAfterSave"/>
4141
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
@@ -55,8 +55,8 @@
5555
<argument name="block" value="$$createPreReqBlock$$"/>
5656
</actionGroup>
5757
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
58-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
59-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1" after="saveEditPanelSettingsAfterBlock"/>
59+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen1"/>
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/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3434
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3535
</actionGroup>
36-
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFromContentPreviewOverlay"/>
36+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3737
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3838
<argument name="contentType" value="PageBuilderTextContentType"/>
3939
</actionGroup>
@@ -45,10 +45,12 @@
4545
</actionGroup>
4646
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello CMS Block from PageBuilder" stepKey="addTextToEditor"/>
4747
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
48+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
4849
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
4950
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToContentCreatedCMSBlockPage2">
5051
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
5152
</actionGroup>
53+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen1"/>
5254
<actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="seePageBuilderOnPage"/>
5355
</test>
5456
</tests>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@
7474
</actionGroup>
7575
<!-- Inline Edit: Add Widget -->
7676
<comment userInput="Inline Edit: Add Widget" stepKey="commentInlineEditAddWidget"/>
77-
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor3"/>
77+
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor3">
78+
<argument name="contentTypeXCoordinate" value="250"/>
79+
<argument name="contentTypeYCoordinate" value="0"/>
80+
</actionGroup>
7881
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd3"/>
7982
<actionGroup ref="addPageLinkWidgetToTinyMCEInline" stepKey="addPageLinkWidgetToTinyMCE">
8083
<argument name="widget" value="TinyMCEWidgetCMSPageLink"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlock">
2929
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3030
</actionGroup>
31+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3132
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3233
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3334
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCE3Test.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
4343
<argument name="CMSPage" value="$$createCMSPage$$"/>
4444
</actionGroup>
45-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
45+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
46+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1" after="switchToPageBuilderStage">
4647
<argument name="contentType" value="PageBuilderTextContentType"/>
4748
</actionGroup>
4849
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
@@ -51,7 +52,8 @@
5152
<click selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="focusOnEditorArea"/>
5253
<fillField selector="{{TextOnStage.textareaPlaceholder('1')}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="fillTextToTextarea"/>
5354
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromTextarea"/>
54-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
55+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
56+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2" after="exitPageBuilderFullScreen"/>
5557
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
5658
<!--Verify Text Content Type on stage after saving cms page-->
5759
<comment userInput="Verify text content type on stage" stepKey="commentVerifyTextOnStage"/>
@@ -77,7 +79,8 @@
7779
</actionGroup>
7880
<executeJS function="return document.getElementById('{{TextOnConfiguration.textAreaId}}').value;" stepKey="expectedData"/>
7981
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
80-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage3"/>
82+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
83+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage3" after="exitPageBuilderFullScreen2"/>
8184
<!-- Switch to TinyMCE4 -->
8285
<comment userInput="Switch to TinyMCE4 " stepKey="comment4"/>
8386
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
@@ -93,7 +96,8 @@
9396
<seeElement selector="{{TextOnStage.variablePlaceholder('1')}}" stepKey="waitForVariablePlaceholder"/>
9497
<seeElement selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetValue"/>
9598
<seeElement selector="{{TextOnStage.widgetPlaceholder('1')}}" stepKey="waitForWidgetPlaceholder"/>
96-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage4"/>
99+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen3"/>
100+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage4" after="exitPageBuilderFullScreen3"/>
97101
<!-- Switch to Textarea -->
98102
<comment userInput="Switch to Textarea" stepKey="comment7"/>
99103
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
@@ -120,7 +124,8 @@
120124
</actionGroup>
121125
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
122126
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
123-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage5"/>
127+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen4"/>
128+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage5" after="exitPageBuilderFullScreen4"/>
124129
<!-- Switch to TinyMCE4 -->
125130
<comment userInput="Switch to TinyMCE4 " stepKey="comment9"/>
126131
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
3434
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3535
</actionGroup>
36+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3637
</before>
3738
<after>
3839
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
@@ -76,6 +77,7 @@
7677
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
7778
<actualResult type="variable">grabComputedTextAlignCMSBlockStage</actualResult>
7879
</assertEquals>
80+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7981
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
8082
<!-- Add Block to CMS Page -->
8183
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
@@ -102,7 +104,7 @@
102104
<expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyRight.value}}</expectedResult>
103105
<actualResult type="variable">grabComputedTextAlignCMSPageStage</actualResult>
104106
</assertEquals>
105-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
107+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
106108
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
107109
<!-- Validate Catalog Products List Widget Aligns Right on Storefront -->
108110
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStorefront">

0 commit comments

Comments
 (0)