Skip to content

Commit 332cd48

Browse files
committed
MC-1438: Editing Text Content Block from the Stage with WYSIWYG turned off completely or by default
1 parent c8f4afa commit 332cd48

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[@data-bind='html: data.main.html']//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>
1919
<element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
2020
<element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
21-
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
21+
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
22+
<element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
2223
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
2324
<element name="importantStyle" type="text" selector="//span[text()='Important']"/>
2425
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<!-- Switch to Textarea -->
108108
<comment userInput="Switch to Textarea" stepKey="comment7"/>
109109
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
110-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE3_1"/>
110+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4_1"/>
111111
<reloadPage stepKey="reloadPage2"/>
112112
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4_1"/>
113113
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
@@ -118,6 +118,7 @@
118118
<comment userInput="Add image to TextArea" stepKey="comment8"/>
119119
<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
120120
<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
121+
<click stepKey="clickStorageRoot" selector="{{MediaGallerySection.StorageRootArrow}}" />
121122
<actionGroup ref="CreateImageFolder" stepKey="CreateImageFolder">
122123
<argument name="ImageFolder" value="ImageFolder"/>
123124
</actionGroup>
@@ -130,7 +131,7 @@
130131
<!-- Switch to TinyMCE4 -->
131132
<comment userInput="Switch to TinyMCE4 " stepKey="comment9"/>
132133
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
133-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4_1"/>
134+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4_2"/>
134135
<!-- Verify image on TinyMCE4 -->
135136
<comment userInput="Verify data on TinyMCE4" stepKey="comment10"/>
136137
<reloadPage stepKey="reloadPage3"/>
@@ -501,7 +502,7 @@
501502
</actionGroup>
502503
<!--Assert Text placeholder-->
503504
<comment userInput="Assert Text placeholder" stepKey="assertTextPlaceholder"/>
504-
<seeElement selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="seeTextPlaceholder"/>
505+
<seeElement selector="{{TextOnStage.textPlaceholder('1')}}" stepKey="seeTextPlaceholder"/>
505506
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
506507
<!--Verify empty content type on storefront-->
507508
<comment userInput="Verify empty content type on storefront" stepKey="commentVerifyEmptyBlock"/>

0 commit comments

Comments
 (0)