Skip to content

Commit deace17

Browse files
kieuphan2406kieuphan2406
committed
MC-1438: Editing Text Content Block from the Stage with WYSIWYG turned off completely or by default
1 parent 19385ae commit deace17

File tree

2 files changed

+42
-16
lines changed

2 files changed

+42
-16
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div" parameterized="true"/>
1212
<element name="textAreaText" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[.='{{arg2}}']" parameterized="true"/>
1313
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@value,'{{arg2}}')]" parameterized="true"/>
14-
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[contains(.,'{{arg2}}')]" parameterized="true"/>
15-
<element name="textString" type="text" selector="//*[contains(@class, 'pagebuilder-text')]//*[text()='{{agr}}']" parameterized="true"/>
14+
<element name="text" type="text" selector="//*[contains(@class, 'pagebuilder-text')][{{arg}}]//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
1615
<element name="mcePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[starts-with(@id, '{{arg2}}')]" parameterized="true"/>
1716
<element name="variablePlaceholder" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[@data-bind='html: data.main.html']//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
1817
<element name="widgetPlaceholder" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[@data-bind='html: data.main.html']//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest.xml

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
<after>
3030
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
3131
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB" />
32+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
33+
<click selector="{{MediaGallerySection.WysiwygArrow}}" stepKey="openWYSIWYGFolder"/>
34+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
35+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
36+
</actionGroup>
37+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
38+
<argument name="Image" value="ImageUpload3"/>
39+
</actionGroup>
3240
<actionGroup ref="logout" stepKey="logout"/>
3341
</after>
3442
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
@@ -56,17 +64,6 @@
5664
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
5765
<argument name="contentType" value="PageBuilderTextContentType"/>
5866
</actionGroup>
59-
<!-- Add image to TextArea -->
60-
<!--<comment userInput="Add image to TextArea" stepKey="comment1"/>-->
61-
<!--<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>-->
62-
<!--<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>-->
63-
<!--<actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">-->
64-
<!--<argument name="ImageFolder" value="ImageFolder"/>-->
65-
<!--</actionGroup>-->
66-
<!--<actionGroup ref="attachImage" stepKey="attachImage1">-->
67-
<!--<argument name="Image" value="ImageUpload3"/>-->
68-
<!--</actionGroup>-->
69-
<!--<actionGroup ref="saveImage" stepKey="insertImage"/>-->
7067
<!-- Add widget to TextArea -->
7168
<comment userInput="Add widget to TextArea" stepKey="comment2"/>
7269
<actionGroup ref="addPageLinkWidgetWYSIWYGDisabled" stepKey="addPageLinkWidgetWYSIWYGDisabled">
@@ -90,9 +87,7 @@
9087
<reloadPage stepKey="reloadPage"/>
9188
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
9289
<waitForElementVisible selector="{{TextOnStage.tinymce('1')}}" stepKey="waitforTinyMCE4"/>
93-
<!--<waitForElementVisible selector="//*[contains(@class, 'pagebuilder-text')]//*[text()='{{PageBuilderTextProperty.value}}']" stepKey="waitForText"/>-->
94-
<waitForElementVisible selector="{{TextOnStage.textString('1', PageBuilderTextProperty.value})}}" stepKey="waitForText"/>
95-
<!--<waitForElementVisible selector="{{TextOnStage.tinymce('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>-->
90+
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="waitForText"/>
9691
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="waitForVariabBaseURL"/>
9792
<waitForElementVisible selector="{{TextOnStage.variablePlaceholder('1')}}" stepKey="waitForVariablePlaceholder"/>
9893
<waitForElementVisible selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="waitForWidgetValue"/>
@@ -108,6 +103,38 @@
108103
<expectedResult type="variable">expectedData</expectedResult>
109104
<actualResult type="variable">actualData</actualResult>
110105
</assertEquals>
106+
<!-- Switch to Textarea -->
107+
<comment userInput="Switch to Textarea" stepKey="comment7"/>
108+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
109+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE3_1"/>
110+
<reloadPage stepKey="reloadPage2"/>
111+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4_1"/>
112+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
113+
<argument name="contentType" value="PageBuilderTextContentType"/>
114+
</actionGroup>
115+
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="" stepKey="clearTextContent"/>
116+
<!-- Add image to TextArea -->
117+
<comment userInput="Add image to TextArea" stepKey="comment8"/>
118+
<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
119+
<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
120+
<actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
121+
<argument name="ImageFolder" value="ImageFolder"/>
122+
</actionGroup>
123+
<actionGroup ref="attachImage" stepKey="attachImage1">
124+
<argument name="Image" value="ImageUpload3"/>
125+
</actionGroup>
126+
<actionGroup ref="saveImage" stepKey="insertImage"/>
127+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
128+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage5"/>
129+
<!-- Switch to TinyMCE4 -->
130+
<comment userInput="Switch to TinyMCE4 " stepKey="comment9"/>
131+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
132+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4_1"/>
133+
<!-- Verify image on TinyMCE4 -->
134+
<comment userInput="Verify data on TinyMCE4" stepKey="comment10"/>
135+
<reloadPage stepKey="reloadPage3"/>
136+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4_2"/>
137+
<waitForElementVisible selector="{{TextOnStage.tinymce('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSourceOnStage2"/>
111138
</test>
112139
<test name="TextAreaInitalStatus">
113140
<annotations>

0 commit comments

Comments
 (0)