Skip to content

Commit 3a03ea7

Browse files
author
Lukasz Borowiec
committed
#512: User edits cms block in full-screen mode only - fixed the mtft tests
1 parent 609f9f8 commit 3a03ea7

6 files changed

+27
-12
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineNotSameSizeTest.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"/>
@@ -85,6 +86,7 @@
8586
<argument name="text" value="PageBuilderButtonItemText_OneCharacter"/>
8687
<argument name="index" value="2"/>
8788
</actionGroup>
89+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
8890
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
8991
<!-- Validate CMS Block Stage -->
9092
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
@@ -159,7 +161,7 @@
159161
<argument name="buttonGroupPage" value="ButtonGroupOnStorefront"/>
160162
<argument name="buttonItemPage" value="ButtonItemOnStorefront"/>
161163
</actionGroup>
162-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
164+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
163165
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
164166
<!-- Validate CMS Page Storefront -->
165167
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 4 additions & 2 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="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -57,7 +58,8 @@
5758
<argument name="property" value="PageBuilderDividerLineWidth_50"/>
5859
</actionGroup>
5960
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsDivider"/>
60-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
61+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
62+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
6163
<!-- Validate CMS Block Stage -->
6264
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
6365
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSBlockStage"/>
@@ -96,7 +98,7 @@
9698
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
9799
<argument name="expectedOffset" value="{{PageBuilderDividerLineThickness_10.value}}*2"/>
98100
</actionGroup>
99-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
101+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
100102
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
101103
<!-- Validate CMS Page Storefront -->
102104
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 4 additions & 2 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="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -80,7 +81,8 @@
8081
<argument name="variable" value="PageBuilderTextArea_VariableBaseURL"/>
8182
</actionGroup>
8283
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsHtml"/>
83-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
84+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
85+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
8486
<!-- Validate CMS Block Stage After Save -->
8587
<comment userInput="Validate CMS Block Stage After Save" stepKey="commentValidateCMSBlockStageAfterSave"/>
8688
<seeElement selector="{{HtmlOnStage.base('1')}}" stepKey="seeHtmlBaseCMSBlockStageAfterSave"/>
@@ -134,7 +136,7 @@
134136
<expectedResult type="string">{{_ENV.MAGENTO_BASE_URL}}</expectedResult>
135137
<actualResult type="variable">actualTextFromHtmlCodeCMSPageStage</actualResult>
136138
</assertStringContainsString>
137-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
139+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
138140
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
139141
<!-- Validate CMS Page Storefront -->
140142
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 4 additions & 2 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="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -57,7 +58,8 @@
5758
<argument name="property" value="PageBuilderHeadingTypeProperty_H1"/>
5859
</actionGroup>
5960
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsHeading"/>
60-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
61+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
62+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
6163
<!-- Validate CMS Block Stage -->
6264
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
6365
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleCMSBlockStage"/>
@@ -85,7 +87,7 @@
8587
<comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage"/>
8688
<seeElement selector="{{HeadingOnStorefront.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleCMSPageStage"/>
8789
<seeElement selector="{{HeadingOnStorefront.headingText(PageBuilderHeadingTypeProperty_H1.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="seeHeadingTextCMSPageStage"/>
88-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
90+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
8991
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
9092
<!-- Validate CMS Page Storefront -->
9193
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 4 additions & 2 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
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
@@ -67,7 +68,8 @@
6768
<argument name="section" value="TextOnStage"/>
6869
<argument name="text" value="{{PageBuilderTextArea_WidgetCMSHomepageLink.editPanelValue}}"/>
6970
</actionGroup>
70-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
71+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
72+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
7173
<!-- Validate CMS Block Stage -->
7274
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
7375
<actionGroup ref="assertTextareaContainsValue" stepKey="assertTextareaContainsValueCMSBlockStage">
@@ -106,7 +108,7 @@
106108
<seeElement selector="{{TextOnStorefront.textAreaText('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSPageStage"/>
107109
<seeElement selector="{{TextOnStorefront.textAreaText('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="seeVariableCMSPageStage"/>
108110
<seeElement selector="{{TextOnStorefront.textWidget('1', _ENV.MAGENTO_BASE_URL, PageBuilderTextArea_WidgetCMSHomepageLink.identifier)}}" stepKey="seeWidgetCMSPageStage"/>
109-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
111+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
110112
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
111113
<!-- Validate CMS Page Storefront -->
112114
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

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

Lines changed: 8 additions & 3 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"/>
@@ -63,7 +64,10 @@
6364
</actionGroup>
6465
<!-- Inline Edit: Add Variable -->
6566
<comment userInput="Inline Edit: Add Variable" stepKey="commentInlineEditAddVariable"/>
66-
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor2"/>
67+
<actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor2">
68+
<argument name="contentTypeXCoordinate" value="250"/>
69+
<argument name="contentTypeYCoordinate" value="0"/>
70+
</actionGroup>
6771
<actionGroup ref="goToEndOfLineTinyMCEEditor" stepKey="moveCaretToEnd2"/>
6872
<actionGroup ref="addVariableToTinyMCEInline" stepKey="addVariableToTinyMCE">
6973
<argument name="variable" value="TinyMCEVariableBaseURL"/>
@@ -92,7 +96,8 @@
9296
</actionGroup>
9397
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
9498
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup"/>
95-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
99+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
100+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock" after="exitPageBuilderFullScreen"/>
96101
<!-- Validate CMS Block Stage -->
97102
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
98103
<seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSBlockStage"/>
@@ -128,7 +133,7 @@
128133
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStage"/>
129134
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStage"/>
130135
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStage"/>
131-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
136+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
132137
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
133138
<!-- Validate CMS Page Storefront -->
134139
<comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>

0 commit comments

Comments
 (0)