Merge remote-tracking branch 'trigger/AC-396' into platform-health

Author: xmav

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateTextEditorProductAttributeTest.xml

@@ -22,7 +22,7 @@
             <!-- Enable WYSIWYG editor -->
             <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
 
-            <!-- Enable TinyMCE 4 -->
+            <!-- Enable TinyMCE  -->
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
 
             <!-- Login as admin -->
@@ -100,7 +100,7 @@
         <!-- Created product attribute appear on product form -->
         <seeElement selector="{{AdminProductFormSection.attributeLabelByText(productTextEditorAttribute.attribute_code)}}" stepKey="seeAttributeLabelInProductForm"/>
 
-        <!-- TinyMCE 4 is displayed in WYSIWYG content area -->
+        <!-- TinyMCE is displayed in WYSIWYG content area -->
         <seeElement selector="{{TinyMCESection.TinyMCE}}" stepKey="seeTinyMCE"/>
 
         <!-- Verify toolbar menu -->

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

@@ -22,7 +22,7 @@
             <!--Enable WYSIWYG options-->
             <comment userInput="Enable WYSIWYG options" stepKey="commentEnableWYSIWYG"/>
             <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYGEditor"/>
-            <magentoCLI command="config:set cms/wysiwyg/editor 'TinyMCE 4'" stepKey="setValueWYSIWYGEditor"/>
+            <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="setValueWYSIWYGEditor" />
             <!--Create block-->
             <comment userInput="Create block" stepKey="commentCreateBlock"/>
             <createData entity="Sales25offBlock" stepKey="createBlock"/>