Merge remote-tracking branch 'mainline/2.3-develop' into MC-6279

Author: krissyhiserote

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

@@ -18,6 +18,9 @@
             <testCaseId value="MAGETWO-58718"/>
             <group value="product"/>
             <group value="WYSIWYGDisabled"/>
+            <skip>
+                <issueId value="MC-13841"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login Admin -->

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

@@ -19,6 +19,7 @@
             <group value="Cms"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
                 <argument name="newWebsiteName" value="secondWebsite"/>
@@ -67,6 +68,7 @@
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
             <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
         </after>
     </test>
 </tests>

app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml

@@ -20,6 +20,7 @@
         </annotations>
 
         <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <createData entity="NewRootCategory" stepKey="createRootCategory"/>
         </before>
 
@@ -44,6 +45,7 @@
             <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForModalDeleteDefaultRootCategory" />
             <click selector="{{AdminCategoryModalSection.ok}}" stepKey="acceptModal1"/>
             <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="waitForPageReloadAfterDeleteDefaultCategory"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <!--logout-->
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>

dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityMultipleStoreViewsTest" summary="Page cache for different CMS pages on multiple store views" ticketId="MAGETWO-52467">
         <variation name="CreateCmsPageEntityMultipleStoreViewsTestVariation1">
+            <data name="issue" xsi:type="string">MC-13801: Test "Page cache for different CMS pages on multiple store views" fails on Jenkins</data>
             <data name="cmsPages/0/is_active" xsi:type="string">Yes</data>
             <data name="cmsPages/0/title" xsi:type="string">NewCmsPage</data>
             <data name="cmsPages/0/store_id/dataset" xsi:type="string">default</data>