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

Author: viktorpetryk

app/code/Magento/Backup/Model/ResourceModel/View/CreateViewsBackup.php

@@ -111,6 +111,6 @@ public function getViewHeader(string $viewName): string
     public function getDropViewSql(string $viewName): string
     {
         $quotedViewName = $this->getConnection()->quoteIdentifier($viewName);
-        return sprintf('DROP VIEW IF EXISTS %s;\n', $quotedViewName);
+        return sprintf("DROP VIEW IF EXISTS %s;\n", $quotedViewName);
     }
 }

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDisableWYSIWYGActionGroup">
+        <annotations>
+            <description>Runs bin/magento command to disable WYSIWYG</description>
+        </annotations>
+
+        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnableWYSIWYGActionGroup">
+        <annotations>
+            <description>Runs bin/magento command to enable WYSIWYG</description>
+        </annotations>
+
+        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertStorefrontTextOnCategoryPageActionGroup.xml

@@ -16,6 +16,6 @@
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{category.name_lwr}}" stepKey="assertCategoryOnStorefront"/>
         <seeInTitle userInput="{{category.name}}" stepKey="seeCategoryNameInTitle"/>
-        <see selector="{{StorefrontCMSPageSection.mainContent}}" userInput="{{text}}" stepKey="seeAssertTextInMainContent"/>
+        <see userInput="{{text}}" stepKey="seeAssertTextInMainContent"/>
     </actionGroup>
 </actionGroups>

dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml renamed to app/code/Magento/Cms/Test/Mftf/Suite/WYSIWYGDisabledSuite.xml

@@ -8,7 +8,7 @@
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="WYSIWYGDisabledSuite">
         <before>
-            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled disabled" />
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
         </before>
         <include>
             <group name="WYSIWYGDisabled"/>
@@ -17,7 +17,7 @@
             <group name="skip"/>
         </exclude>
         <after>
-            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled enabled" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
         </after>
     </suite>
 </suites>

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypal"/>
+            <skip>
+                <issueId value="MC-33707"/>
+            </skip>
         </annotations>
         <before>