Skip to content

Commit 30376a5

Browse files
hannahnidahannahnida
committed
#512: User edits CMS Block content in full-screen mode only - Fixed Mftf test
1 parent c5630b6 commit 30376a5

File tree

4 files changed

+35
-32
lines changed

4 files changed

+35
-32
lines changed

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

Lines changed: 18 additions & 15 deletions
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
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
@@ -98,9 +99,11 @@
9899
<actionGroup ref="dragContentTypeToStage" stepKey="dragDividerIntoStage">
99100
<argument name="contentType" value="PageBuilderDividerContentType"/>
100101
</actionGroup>
102+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
101103
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
102104
<!-- Validate CMS Block Stage -->
103105
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
106+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
104107
<actionGroup ref="validateContainedRowAppearance" stepKey="validateRowAppearanceCMSBlockStage"/>
105108
<actionGroup ref="validateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabled" stepKey="validateBackgroundCMSBlockStage">
106109
<argument name="page" value="RowOnStage"/>
@@ -137,12 +140,24 @@
137140
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
138141
<argument name="page" value="DividerOnStage"/>
139142
</actionGroup>
140-
<!-- Add Block to CMS Page -->
141-
<comment userInput="Add Block to CMS Page" stepKey="commentAddBlockToCMSPage"/>
143+
<!-- Edit Row On CMS Page -->
144+
<comment userInput="Edit Row On CMS Page" stepKey="commentEditRowCMSPage"/>
142145
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
143146
<argument name="CMSPage" value="$$createCMSPage$$"/>
144147
</actionGroup>
145148
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
149+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRowCMSPage">
150+
<argument name="contentType" value="PageBuilderRowContentType"/>
151+
</actionGroup>
152+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCMSPage">
153+
<argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
154+
</actionGroup>
155+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingCMSPage">
156+
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
157+
</actionGroup>
158+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowCMSPage"/>
159+
<!-- Add Block to CMS Page -->
160+
<comment userInput="Add Block to CMS Page" stepKey="commentAddBlockToCMSPage"/>
146161
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
147162
<argument name="contentType" value="PageBuilderBlockContentType"/>
148163
</actionGroup>
@@ -156,18 +171,6 @@
156171
<argument name="block" value="$$createCMSBlock$$"/>
157172
</actionGroup>
158173
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
159-
<!-- Edit Row On CMS Page -->
160-
<comment userInput="Edit Row On CMS Page" stepKey="commentEditRowCMSPage"/>
161-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRowCMSPage">
162-
<argument name="contentType" value="PageBuilderRowContentType"/>
163-
</actionGroup>
164-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCMSPage">
165-
<argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
166-
</actionGroup>
167-
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingCMSPage">
168-
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
169-
</actionGroup>
170-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowCMSPage"/>
171174
<!-- Validate CMS Page Stage -->
172175
<comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage"/>
173176
<actionGroup ref="validateContainedRowAppearance" stepKey="validateRowAppearanceCMSPageStage">
@@ -216,7 +219,7 @@
216219
<argument name="page" value="DividerOnStorefront"/>
217220
<argument name="expectedOffset" value="{{PageBuilderDividerLineThickness_Default.value}}*2"/>
218221
</actionGroup>
219-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
222+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
220223
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
221224
<!-- Validate CMS Page Storefront -->
222225
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3232
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3333
</actionGroup>
34+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3435
</before>
3536
<after>
3637
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -46,6 +47,8 @@
4647
</after>
4748
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4849
<argument name="contentType" value="PageBuilderRowContentType"/>
50+
<argument name="offsetXCoordinate" value="0"/>
51+
<argument name="offsetYCoordinate" value="-40"/>
4952
</actionGroup>
5053
<actionGroup ref="chooseVisualSelectOption" stepKey="setAppearance">
5154
<argument name="property" value="PageBuilderRowAppearance_Contained"/>
@@ -97,12 +100,24 @@
97100
<argument name="contentType" value="PageBuilderButtonsContentType"/>
98101
</actionGroup>
99102
<seeElement selector="{{ButtonItemOnStage.base('1')}}" stepKey="seeButtonStage"/>
103+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
100104
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
101-
<!-- Add Block to CMS Page -->
105+
<!-- Edit Row On CMS Page -->
102106
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
103107
<argument name="CMSPage" value="$$createCMSPage$$"/>
104108
</actionGroup>
105109
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
110+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRowCMSPage">
111+
<argument name="contentType" value="PageBuilderRowContentType"/>
112+
</actionGroup>
113+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCMSPage">
114+
<argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
115+
</actionGroup>
116+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingCMSPage">
117+
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
118+
</actionGroup>
119+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowCMSPage"/>
120+
<!-- Add Block to CMS Page -->
106121
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
107122
<argument name="contentType" value="PageBuilderBlockContentType"/>
108123
</actionGroup>
@@ -116,17 +131,6 @@
116131
<argument name="block" value="$$createCMSBlock$$"/>
117132
</actionGroup>
118133
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
119-
<!-- Edit Row On CMS Page -->
120-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRowCMSPage">
121-
<argument name="contentType" value="PageBuilderRowContentType"/>
122-
</actionGroup>
123-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCMSPage">
124-
<argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
125-
</actionGroup>
126-
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingCMSPage">
127-
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
128-
</actionGroup>
129-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRowCMSPage"/>
130134
<!-- Validate CMS Page Stage -->
131135
<actionGroup ref="validateVideoBackgroundWithAllAttributes" stepKey="validateCMSPageStage">
132136
<argument name="section" value="RowOnStorefront"/>
@@ -140,7 +144,7 @@
140144
<argument name="index" value="2"/>
141145
</actionGroup>
142146
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.base('1')}}" stepKey="seeButtonCMSPageStage"/>
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="navigateToStorefront">

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
<comment userInput="Edit Block and configure Row" stepKey="commentConfigureRowInBlock"/>
4141
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4242
<argument name="contentType" value="PageBuilderRowContentType"/>
43-
<argument name="offsetXCoordinate" value="0"/>
44-
<argument name="offsetYCoordinate" value="-40"/>
4543
</actionGroup>
4644
<actionGroup ref="chooseVisualSelectOption" stepKey="enterRowAppearance">
4745
<argument name="property" value="PageBuilderRowAppearance_Contained"/>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<comment userInput="Edit Block and configure row vertical align bottom" stepKey="commentConfigureRowVerticalAlignBottom"/>
3838
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
3939
<argument name="contentType" value="PageBuilderRowContentType"/>
40-
<argument name="offsetXCoordinate" value="0"/>
41-
<argument name="offsetYCoordinate" value="-40"/>
4240
</actionGroup>
4341
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
4442
<argument name="property" value="PageBuilderMinHeightProperty_500px"/>

0 commit comments

Comments
 (0)