Skip to content

Commit ca4879a

Browse files
author
Hwashiang Yu
committed
MC-34648: Update TinyMCE
- Corrected deprecation for mftf
1 parent ee5a96a commit ca4879a

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
<element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
4545
<element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
4646
<element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
47-
<!-- deprecated New element was introduced. Please use 'ImageDescriptionTinyMCE4'-->
48-
<element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" />
47+
<element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" deprecated="New element was introduced. Please use 'ImageDescriptionTinyMCE4'"/>
4948
<element name="ImageDescriptionTinyMCE4" type="input" selector="#alt" />
5049
<element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
5150
<element name="UploadImage" type="file" selector=".fileupload" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<waitForPageLoad stepKey="wait5"/>
3838
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
3939
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
40-
<waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
41-
<seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
40+
<comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
41+
<comment userInput="removing deprecated element" stepKey="seeTinyMCE3" />
4242
<wait time="3" stepKey="waiting"/>
4343
<comment userInput="Click Insert image button" stepKey="clickImageButton"/>
44-
<click selector="{{TinyMCESection.InsertImageBtnTinyMCE3}}" stepKey="clickInsertImage" />
44+
<comment userInput="removing deprecated element" stepKey="clickInsertImage" />
4545
<waitForPageLoad stepKey="waitForiFrameToLoad" />
4646
<!-- Switch to the Edit/Insert Image iFrame -->
4747
<comment userInput="Switching to iFrame" stepKey="insertImageiFrame"/>
@@ -62,7 +62,7 @@
6262
<executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable2"/>
6363
<switchToIFrame selector="insert-image" stepKey="switchToIFrame2"/>
6464
<waitForElementVisible selector="{{MediaGallerySection.insertBtn}}" stepKey="waitForInsertBtnOnIFrame" />
65-
<fillField selector="{{MediaGallerySection.ImageDescriptionTinyMCE3}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
65+
<fillField selector="{{MediaGallerySection.ImageDescriptionTinyMCE4}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
6666
<click selector="{{MediaGallerySection.insertBtn}}" stepKey="clickInsertBtn" />
6767
<waitForPageLoad stepKey="wait3"/>
6868
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>

app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,13 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="ProductWYSIWYGSection">
12-
<!-- Deprecated this version of tinyMCE is no longer supported-->
13-
<element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
12+
<element name="Tinymce3MSG" type="button" selector=".admin__field-error" deprecated="this version of tinyMCE is no longer supported"/>
1413
</section>
1514
<section name="TinyMCESection">
16-
<!-- Deprecated this version of tinyMCE is no longer supported-->
17-
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
18-
<!-- Deprecated this version of tinyMCE is no longer supported-->
19-
<element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
15+
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl" deprecated="this version of tinyMCE is no longer supported"/>
16+
<element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image" deprecated="this version of tinyMCE is no longer supported"/>
2017
</section>
2118
<section name="NewsletterWYSIWYGSection">
22-
<!-- Deprecated this version of tinyMCE is no longer supported-->
23-
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
19+
<element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl" deprecated="this version of tinyMCE is no longer supported"/>
2420
</section>
2521
</sections>

app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<waitForPageLoad stepKey="wait5"/>
6767
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
6868
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
69-
<waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
70-
<seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
69+
<comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
70+
<comment userInput="removing deprecated element" stepKey="seeTinyMCE3" />
7171
<executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE3!');" stepKey="executeJSFillContent2"/>
7272
<click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2" />
7373
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab2" />

0 commit comments

Comments
 (0)