Merge remote-tracking branch 'origin/MC-31760' into 2.4-develop-pr16

Author: zakdma

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

@@ -17,10 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-89185"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
         </before>
         <after>
             <actionGroup ref="deleteBlock" stepKey="deleteCreatedBlock">

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

@@ -17,10 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-25580"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="adminLogout"/>

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

@@ -17,10 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-89184"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="logout"/>

composer.json

@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "2.6.1",
+        "magento/magento2-functional-testing-framework": "2.6.2",
         "pdepend/pdepend": "2.5.2",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",