From 6c9a976678e86e25d66aebd1175ceda766707086 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 23 Aug 2020 21:30:22 +0300
Subject: [PATCH 1/3] v5 add AdminOpenConfigurationStoresPageActionGroup

---
 ...nOpenConfigurationStoresPageActionGroup.xml | 18 ++++++++++++++++++
 .../Test/AdminSwitchWYSIWYGOptionsTest.xml     |  6 ++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml
new file mode 100644
index 0000000000000..eea17ab7b40e9
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.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="AdminOpenConfigurationStoresPageActionGroup">
+        <annotations>
+            <description>Open configuration stores page.</description>
+        </annotations>
+
+        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 01b2101d3346c..c4e461c5adb5f 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
             <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
         </before>
-        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenConfigurationStoresPageActionGroup" stepKey="navigateToWYSIWYGConfigPage1"/>
         <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
@@ -53,8 +52,7 @@
         <waitForPageLoad stepKey="wait3" />
         <!--see widget on Storefront-->
         <see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
-        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
-        <waitForPageLoad stepKey="wait4"/>
+        <actionGroup ref="AdminOpenConfigurationStoresPageActionGroup" stepKey="navigateToWYSIWYGConfigPage2"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>

From f6ba58c371701cdccba325341aa5f676c5822ff9 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 12:16:54 +0300
Subject: [PATCH 2/3] represented new page folowing best practice

---
 .../AdminOpenConfigurationStoresPageActionGroup.xml |  2 +-
 .../Test/Mftf/Page/AdminConfigurationStoresPage.xml | 13 +++++++++++++
 .../ConfigurationStoresPage.xml                     |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml
index eea17ab7b40e9..d38edd0b8a781 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenConfigurationStoresPageActionGroup.xml
@@ -12,7 +12,7 @@
             <description>Open configuration stores page.</description>
         </annotations>
 
-        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
+        <amOnPage url="{{AdminConfigurationStoresPage.url}}" stepKey="goToConfigurationStoresPage"/>
         <waitForPageLoad stepKey="waitPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
new file mode 100644
index 0000000000000..480f9e86c19f6
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+        <section name="WYSIWYGOptionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
index 81eb04692cc57..a11e1456d6686 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
@@ -7,7 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
+    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" deprecated="Deprecated New Page was introduced. Please use 'AdminConfigurationStoresPage'" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>
 </pages>

From c7037492f6ac978f549d84a673403abd1c874f9d Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 12:39:59 +0300
Subject: [PATCH 3/3] minor changes

---
 .../AdminConfigurationStoresPage/ConfigurationStoresPage.xml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
index a11e1456d6686..85118a3197985 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage/ConfigurationStoresPage.xml
@@ -7,7 +7,8 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" deprecated="Deprecated New Page was introduced. Please use 'AdminConfigurationStoresPage'" area="admin" module="Catalog">
+    <!--  @deprecated New Page was introduced. Please use "AdminConfigurationStoresPage"  -->
+    <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>
 </pages>