Skip to content

Commit c5630b6

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 3a03ea7 + 6e18fde commit c5630b6

6 files changed

+27
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml

Lines changed: 3 additions & 1 deletion
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="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -54,6 +55,7 @@
5455
<argument name="containerTargetIndex" value="2"/>
5556
<argument name="contentTypeIndex" value="1"/>
5657
</actionGroup>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5759
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
5860
<!-- Validate CMS Block Stage -->
5961
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -136,7 +138,7 @@
136138
<expectedResult type="int">2</expectedResult>
137139
<actualResult type="variable">widthDifferenceCMSPageStage</actualResult>
138140
</assertLessThanOrEqual>
139-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
141+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
140142
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
141143
<!-- Validate CMS Page Storefront -->
142144
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3030
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3131
</actionGroup>
32+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3233
</before>
3334
<after>
3435
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -113,6 +114,7 @@
113114
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
114115
<argument name="containerTargetIndex" value="1"/>
115116
</actionGroup>
117+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
116118
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
117119
<!-- Validate CMS Block Stage -->
118120
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -206,7 +208,7 @@
206208
<argument name="page" value="DividerOnStorefront"/>
207209
<argument name="expectedOffset" value="{{PageBuilderDividerLineThickness_Default.value}}*2"/>
208210
</actionGroup>
209-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
211+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
210212
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
211213
<!-- Validate CMS Page Storefront -->
212214
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3030
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3131
</actionGroup>
32+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3233
</before>
3334
<after>
3435
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -39,6 +40,8 @@
3940
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel">
4041
<argument name="contentType" value="PageBuilderRowContentType"/>
4142
<argument name="index" value="1"/>
43+
<argument name="contentTypeXCoordinate" value="0"/>
44+
<argument name="contentTypeYCoordinate" value="-40"/>
4245
</actionGroup>
4346
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
4447
<argument name="property" value="PageBuilderRowAppearance_Contained"/>
@@ -100,6 +103,7 @@
100103
<actualResult type="variable">thirdMinHeightCMSBlockStage</actualResult>
101104
<expectedResult type="variable">expectedThirdHeightCMSBlockStage</expectedResult>
102105
</assertEquals>
106+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
103107
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
104108
<!-- Add Block to CMS Page -->
105109
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
@@ -140,7 +144,7 @@
140144
<actualResult type="variable">thirdMinHeightCMSPageStage</actualResult>
141145
<expectedResult type="variable">expectedThirdHeightCMSPageStage</expectedResult>
142146
</assertEquals>
143-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
147+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
144148
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
145149
<!-- Validate Storefront -->
146150
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml

Lines changed: 6 additions & 1 deletion
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
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
@@ -131,7 +132,9 @@
131132
<argument name="property" value="PageBuilderTabMinimumHeightEmptyProperty"/>
132133
</actionGroup>
133134
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTab2"/>
135+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
134136
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
137+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
135138
<!-- Validate CMS Block Stage -->
136139
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
137140
<seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeTab2ActiveCMSBlockStage"/>
@@ -224,7 +227,7 @@
224227
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
225228
<argument name="index" value="2"/>
226229
</actionGroup>
227-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
230+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
228231
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
229232
<!-- Validate CMS Page Storefront -->
230233
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>
@@ -334,6 +337,7 @@
334337
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
335338
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
336339
</actionGroup>
340+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen1"/>
337341
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelTab1Again">
338342
<argument name="section" value="TabOnStage"/>
339343
<argument name="targetIndex" value="1"/>
@@ -350,6 +354,7 @@
350354
<argument name="property" value="PageBuilderTabsDefaultActiveTab"/>
351355
</actionGroup>
352356
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTabs2"/>
357+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
353358
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock2"/>
354359
<!-- Validate CMS Page Stage Again -->
355360
<comment userInput="Validate CMS Page Stage Again" stepKey="commentValidateCMSPageStageAgain"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContainedAppearanceHasEqualWidthToContentsTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
3131
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3232
</actionGroup>
33+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3334
</before>
3435
<after>
3536
<deleteData createDataKey="createCMSBlock" stepKey="deletePreReqBlock"/>
@@ -39,6 +40,8 @@
3940
<comment userInput="Edit Block and configure Row" stepKey="commentConfigureRowInBlock"/>
4041
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4142
<argument name="contentType" value="PageBuilderRowContentType"/>
43+
<argument name="offsetXCoordinate" value="0"/>
44+
<argument name="offsetYCoordinate" value="-40"/>
4245
</actionGroup>
4346
<actionGroup ref="chooseVisualSelectOption" stepKey="enterRowAppearance">
4447
<argument name="property" value="PageBuilderRowAppearance_Contained"/>
@@ -66,6 +69,7 @@
6669
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
6770
</actionGroup>
6871
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsInBlock2"/>
72+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6973
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveBlock"/>
7074
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
7175
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -95,7 +99,7 @@
9599
<argument name="containerIndex" value="2"/>
96100
<argument name="containerPadding" value="PageBuilderPaddingPropertyRowDefault"/>
97101
</actionGroup>
98-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
102+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
99103
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
100104
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
101105
<!-- Validate width after save -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
2828
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
2929
</actionGroup>
30+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3031
</before>
3132
<after>
3233
<deleteData createDataKey="createCMSBlock" stepKey="deletePreReqBlock"/>
@@ -36,6 +37,8 @@
3637
<comment userInput="Edit Block and configure row vertical align bottom" stepKey="commentConfigureRowVerticalAlignBottom"/>
3738
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
3839
<argument name="contentType" value="PageBuilderRowContentType"/>
40+
<argument name="offsetXCoordinate" value="0"/>
41+
<argument name="offsetYCoordinate" value="-40"/>
3942
</actionGroup>
4043
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
4144
<argument name="property" value="PageBuilderMinHeightProperty_500px"/>
@@ -44,6 +47,7 @@
4447
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
4548
</actionGroup>
4649
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsInBlock"/>
50+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
4751
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveBlock"/>
4852
<!-- Go to CMS Page and choose Block -->
4953
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
@@ -75,7 +79,7 @@
7579
<argument name="padding" value="PageBuilderPaddingProperty10"/>
7680
<argument name="minHeight" value="PageBuilderMinHeightProperty_500px.intValue"/>
7781
</actionGroup>
78-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
82+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
7983
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
8084
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
8185
<!-- Verify Vertical Alignment On Stage - After Save -->

0 commit comments

Comments
 (0)