Skip to content

Commit c77d015

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 4e746a9 + b68ebd5 commit c77d015

11 files changed

+23
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
2929
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3030
</actionGroup>
31+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3132
</before>
3233
<after>
3334
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
@@ -52,9 +53,11 @@
5253
<argument name="block" value="$$createPreReqBlock$$"/>
5354
</actionGroup>
5455
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
56+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
5557
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
5658
<!-- Validate CMS Block Stage -->
5759
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
60+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
5861
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockCMSBlockStage">
5962
<argument name="block" value="$$createPreReqBlock$$"/>
6063
<argument name="index" value="1"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
4949
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
5050
</actionGroup>
51+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
5152
</before>
5253
<after>
5354
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -99,6 +100,7 @@
99100
<actionGroup ref="validateCannotSeeProductInDefaultProductCarousel" stepKey="validateCannotSeeProduct6CMSBlockStage">
100101
<argument name="product" value="$$createProduct6$$"/>
101102
</actionGroup>
103+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
102104
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
103105
<!-- Add Block to CMS Page -->
104106
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
4949
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
5050
</actionGroup>
51+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
5152
</before>
5253
<after>
5354
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -104,6 +105,7 @@
104105
<argument name="property" value="PageBuilderProductsCarouselSettingsShowDots_Enabled"/>
105106
</actionGroup>
106107
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
108+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
107109
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
108110
<!-- Add Block to CMS Page -->
109111
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
4949
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
5050
</actionGroup>
51+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
5152
</before>
5253
<after>
5354
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -103,6 +104,7 @@
103104
<actionGroup ref="validateCannotSeeProductInDefaultProductCarousel" stepKey="validateCannotSeeProduct6CMSBlockStage">
104105
<argument name="product" value="$$createProduct6$$"/>
105106
</actionGroup>
107+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
106108
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
107109
<!-- Add Block to CMS Page -->
108110
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
4949
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
5050
</actionGroup>
51+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
5152
</before>
5253
<after>
5354
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -83,6 +84,7 @@
8384
<argument name="property" value="PageBuilderProductsCarouselSettingsCarouselMode_Continuous"/>
8485
</actionGroup>
8586
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
87+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
8688
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
8789
<!-- Add Block to CMS Page -->
8890
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3434
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3535
</actionGroup>
36+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3637
</before>
3738
<after>
3839
<deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
@@ -60,6 +61,7 @@
6061
<argument name="category" value="$$createCategory.name$$"/>
6162
</actionGroup>
6263
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
64+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
6365
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
6466
<!-- Add Block to CMS Page -->
6567
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
4040
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
4141
</actionGroup>
42+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
4243
</before>
4344
<after>
4445
<deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
@@ -72,9 +73,11 @@
7273
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
7374
</actionGroup>
7475
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsProducts"/>
76+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
7577
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
7678
<!-- Validate CMS Block Stage -->
7779
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
80+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
7881
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountCMSBlockStage">
7982
<argument name="page" value="ProductsOnStage"/>
8083
<argument name="count" value="3"/>
@@ -150,16 +153,19 @@
150153
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage2">
151154
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
152155
</actionGroup>
156+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen1"/>
153157
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuProducts2">
154158
<argument name="contentType" value="PageBuilderProductsContentType"/>
155159
</actionGroup>
156160
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterNumberOfProductsToDisplay2">
157161
<argument name="property" value="PageBuilderProductsCountPropertyTwo"/>
158162
</actionGroup>
159163
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsProducts2"/>
164+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenAfterEdit"/>
160165
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock2"/>
161166
<!-- Validate CMS Block Stage Again -->
162167
<comment userInput="Validate CMS Block Stage Again" stepKey="commentValidateCMSBlockStage2"/>
168+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen2"/>
163169
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountCMSBlockStage2">
164170
<argument name="page" value="ProductsOnStage"/>
165171
<argument name="count" value="2"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
6868
</actionGroup>
6969
<selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store Views" stepKey="assignAllStoreViewsToBlock"/>
70+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
7071
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelGroup">
7172
<argument name="contentType" value="PageBuilderProductsContentType"/>
7273
</actionGroup>
@@ -91,6 +92,7 @@
9192
<argument name="page" value="ProductsOnStage"/>
9293
<argument name="product" value="SimpleProduct"/>
9394
</actionGroup>
95+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
9496
<actionGroup ref="SaveAndCloseCMSBlockWithSplitButtonActionGroup" stepKey="saveAndCloseCMSBlockWithSplitButton"/>
9597
<!-- Add block with product inside to CMS Page -->
9698
<comment userInput="Add block with product inside to CMS Page" stepKey="commentAddBlockWithProductInsideToCmsPage"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
</actionGroup>
3737
<!-- Update block with text -->
3838
<comment userInput="Update block with text" stepKey="commentUpdateBlockWithText"/>
39+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3940
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText1">
4041
<argument name="contentType" value="PageBuilderTextContentType"/>
4142
</actionGroup>
@@ -46,6 +47,7 @@
4647
<argument name="contentType" value="PageBuilderTextContentType"/>
4748
<argument name="content" value="{{PageBuilderTextProperty.value}}"/>
4849
</actionGroup>
50+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
4951
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveBlock"/>
5052
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCmsPage">
5153
<argument name="CMSPage" value="$$createCMSPage$$"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderContainedRowMinHeightThroughBlockContentTypeTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel">
4141
<argument name="contentType" value="PageBuilderRowContentType"/>
4242
<argument name="index" value="1"/>
43-
<argument name="contentTypeXCoordinate" value="0"/>
44-
<argument name="contentTypeYCoordinate" value="-40"/>
4543
</actionGroup>
4644
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
4745
<argument name="property" value="PageBuilderRowAppearance_Contained"/>

0 commit comments

Comments
 (0)