Skip to content

Commit c324fc6

Browse files
hannahnidahannahnida
committed
#512: User edits Blocks content in full-screen mode only - Fixed mftf tests after CR
1 parent 21a9292 commit c324fc6

File tree

32 files changed

+70
-76
lines changed

32 files changed

+70
-76
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,11 @@
1919
<group value="pagebuilder-cms-block"/>
2020
</annotations>
2121
<before>
22-
<comment userInput="---merging to remove step---" stepKey="createPreReqCategory"/>
23-
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock" before="navigateToAPageWithPageBuilder"/>
22+
<createData entity="_emptyCmsBlock" stepKey="createPreReqCategory"/>
2423
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
25-
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
24+
<argument name="CMSBlockPage" value="$$createPreReqCategory$$"/>
2625
</actionGroup>
27-
<comment userInput="---merging to remove step---" stepKey="expandContentSection"/>
26+
<remove keyForRemoval="expandContentSection"/>
2827
</before>
29-
<after>
30-
<comment userInput="---merging to remove step---" stepKey="deleteCreatedCategory"/>
31-
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock" before="logout"/>
32-
</after>
3328
</test>
3429
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<argument name="text" value="PageBuilderButtonItemText_OneCharacter"/>
8787
<argument name="index" value="2"/>
8888
</actionGroup>
89-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
89+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
9090
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
9191
<!-- Validate CMS Block Stage -->
9292
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -161,7 +161,7 @@
161161
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
162162
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
163163
</actionGroup>
164-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
164+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
165165
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
166166
<!-- Validate CMS Page Storefront -->
167167
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<argument name="property" value="PageBuilderDividerLineWidth_50"/>
5959
</actionGroup>
6060
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsDivider"/>
61-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
62-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
61+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
62+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
6363
<!-- Validate CMS Block Stage -->
6464
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
6565
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSBlockStage"/>
@@ -98,7 +98,7 @@
9898
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
9999
<argument name="expectedOffset" value="{{PageBuilderDividerLineThickness_10.value}}*2"/>
100100
</actionGroup>
101-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
101+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
102102
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
103103
<!-- Validate CMS Page Storefront -->
104104
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<argument name="variable" value="PageBuilderTextArea_VariableBaseURL"/>
8282
</actionGroup>
8383
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsHtml"/>
84-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
85-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
84+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
85+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
8686
<!-- Validate CMS Block Stage After Save -->
8787
<comment userInput="Validate CMS Block Stage After Save" stepKey="commentValidateCMSBlockStageAfterSave"/>
8888
<seeElement selector="{{HtmlOnStage.base('1')}}" stepKey="seeHtmlBaseCMSBlockStageAfterSave"/>
@@ -136,7 +136,7 @@
136136
<expectedResult type="string">{{_ENV.MAGENTO_BASE_URL}}</expectedResult>
137137
<actualResult type="variable">actualTextFromHtmlCodeCMSPageStage</actualResult>
138138
</assertStringContainsString>
139-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
139+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
140140
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
141141
<!-- Validate CMS Page Storefront -->
142142
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<argument name="property" value="PageBuilderHeadingTypeProperty_H1"/>
5959
</actionGroup>
6060
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsHeading"/>
61-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
62-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
61+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
62+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
6363
<!-- Validate CMS Block Stage -->
6464
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
6565
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleCMSBlockStage"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<argument name="section" value="TextOnStage"/>
6969
<argument name="text" value="{{PageBuilderTextArea_WidgetCMSHomepageLink.editPanelValue}}"/>
7070
</actionGroup>
71-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
72-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
71+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
72+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
7373
<!-- Validate CMS Block Stage -->
7474
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
7575
<actionGroup ref="assertTextareaContainsValue" stepKey="assertTextareaContainsValueCMSBlockStage">
@@ -108,7 +108,7 @@
108108
<seeElement selector="{{TextOnStorefront.textAreaText('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSPageStage"/>
109109
<seeElement selector="{{TextOnStorefront.textAreaText('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="seeVariableCMSPageStage"/>
110110
<seeElement selector="{{TextOnStorefront.textWidget('1', _ENV.MAGENTO_BASE_URL, PageBuilderTextArea_WidgetCMSHomepageLink.identifier)}}" stepKey="seeWidgetCMSPageStage"/>
111-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
111+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
112112
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
113113
<!-- Validate CMS Page Storefront -->
114114
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
</actionGroup>
107107
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
108108
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup"/>
109-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
110-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
109+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
110+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
111111
<!-- Validate CMS Block Stage -->
112112
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
113113
<seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSBlockStage"/>
@@ -143,7 +143,7 @@
143143
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStage"/>
144144
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStage"/>
145145
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStage"/>
146-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
146+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
147147
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
148148
<!-- Validate CMS Page Storefront -->
149149
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@
7070
<expectedResult type="variable">yCoordinate1Block</expectedResult>
7171
<actualResult type="variable">yCoordinate2Block</actualResult>
7272
</assertNotEquals>
73-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
73+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
7474
<actionGroup ref="SaveAndCloseCMSBlockWithSplitButtonActionGroup" stepKey="saveCMSBlock"/>
7575
<!-- Go to CMS Page and choose Block -->
7676
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
7777
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
7878
<argument name="CMSPage" value="$$createCMSPage$$"/>
7979
</actionGroup>
80-
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen2"/>
80+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStagePage"/>
8181
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContentPage">
8282
<argument name="contentType" value="PageBuilderBlockContentType"/>
8383
</actionGroup>
@@ -99,7 +99,7 @@
9999
<expectedResult type="variable">yCoordinate1Page</expectedResult>
100100
<actualResult type="variable">yCoordinate2Page</actualResult>
101101
</assertNotEquals>
102-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
102+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
103103
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
104104
<!-- Validate CMS Page Storefront -->
105105
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<argument name="containerTargetIndex" value="2"/>
5656
<argument name="contentTypeIndex" value="1"/>
5757
</actionGroup>
58-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
5959
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
6060
<!-- Validate CMS Block Stage -->
6161
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -138,7 +138,7 @@
138138
<expectedResult type="int">2</expectedResult>
139139
<actualResult type="variable">widthDifferenceCMSPageStage</actualResult>
140140
</assertLessThanOrEqual>
141-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
141+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
142142
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
143143
<!-- Validate CMS Page Storefront -->
144144
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
115115
<argument name="containerTargetIndex" value="1"/>
116116
</actionGroup>
117-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
117+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
118118
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
119119
<!-- Validate CMS Block Stage -->
120120
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -208,7 +208,7 @@
208208
<argument name="page" value="DividerOnStorefront"/>
209209
<argument name="expectedOffset" value="{{PageBuilderDividerLineThickness_Default.value}}*2"/>
210210
</actionGroup>
211-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1"/>
211+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
212212
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
213213
<!-- Validate CMS Page Storefront -->
214214
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

0 commit comments

Comments
 (0)