From 3705530de5f3672586efc01222b3af59bceefbf9 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 17 Apr 2020 13:51:06 -0500
Subject: [PATCH 1/2] MQE-2081: Functional Tests builds will only pass when
 MFTF and MTF are selected

---
 .../AdminDisableWYSIWYGActionGroup.xml         | 18 ++++++++++++++++++
 .../AdminEnableWYSIWYGActionGroup.xml          | 18 ++++++++++++++++++
 .../Test/Mftf/Suite}/WYSIWYGDisabledSuite.xml  |  4 ++--
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
 rename {dev/tests/acceptance/tests/_suite => app/code/Magento/Cms/Test/Mftf/Suite}/WYSIWYGDisabledSuite.xml (73%)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
new file mode 100644
index 0000000000000..7e035a47824ee
--- /dev/null
+++ b/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>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
new file mode 100644
index 0000000000000..6c9b439e2941b
--- /dev/null
+++ b/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>
diff --git a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml b/app/code/Magento/Cms/Test/Mftf/Suite/WYSIWYGDisabledSuite.xml
similarity index 73%
rename from dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
rename to app/code/Magento/Cms/Test/Mftf/Suite/WYSIWYGDisabledSuite.xml
index 924c712404dfe..20b596d843f74 100644
--- a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
+++ b/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>

From 835a772076b0164e03e23cdad9d72aafc7afe7b3 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Tue, 21 Apr 2020 15:26:30 -0500
Subject: [PATCH 2/2] MQE-2081: Functional Tests builds will only pass when
 MFTF and MTF are selected

---
 .../AssertStorefrontTextOnCategoryPageActionGroup.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertStorefrontTextOnCategoryPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertStorefrontTextOnCategoryPageActionGroup.xml
index aa761854a10fa..eb060f6d2cef8 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertStorefrontTextOnCategoryPageActionGroup.xml
+++ b/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>