From a1c3ade9d7afa02049f124b25c034c91733a626b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@gmail.com>
Date: Thu, 28 Nov 2019 10:46:26 +0100
Subject: [PATCH 1/3] REFACTOR: Extract Action Groups to separate files
 (according to MFTF best practices)

---
 .../ActionGroup/CreateBackupActionGroup.xml   | 64 -------------------
 .../CreateDatabaseBackupActionGroup.xml       | 28 ++++++++
 .../CreateMediaBackupActionGroup.xml          | 28 ++++++++
 .../CreateSystemBackupActionGroup.xml         | 28 ++++++++
 .../Test/AdminCreateAndDeleteBackupsTest.xml  |  6 +-
 5 files changed, 87 insertions(+), 67 deletions(-)
 delete mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
 create mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
 create mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateMediaBackupActionGroup.xml
 create mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateSystemBackupActionGroup.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
deleted file mode 100644
index cc7691752c62e..0000000000000
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateBackupActionGroup.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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="createSystemBackup">
-        <annotations>
-            <description>Creates a System Backup using provided Backup Entity.</description>
-        </annotations>
-        <arguments>
-            <argument name="backup" defaultValue="SystemBackup"/>
-        </arguments>
-
-        <click selector="{{AdminMainActionsSection.systemBackup}}" stepKey="clickCreateBackupButton"/>
-        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-        <waitForElementNotVisible selector=".loading-mask" time="300" stepKey="waitForBackupProcess"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You created the system backup." stepKey="seeSuccessMessage"/>
-        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-    </actionGroup>
-
-    <actionGroup name="createMediaBackup">
-        <annotations>
-            <description>Creates a Media Backup using provided Backup Entity.</description>
-        </annotations>
-        <arguments>
-            <argument name="backup" defaultValue="MediaBackup"/>
-        </arguments>
-
-        <click selector="{{AdminMainActionsSection.mediaBackup}}" stepKey="clickCreateBackupButton"/>
-        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database and media backup." stepKey="seeSuccessMessage"/>
-        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-    </actionGroup>
-
-    <actionGroup name="createDatabaseBackup">
-        <annotations>
-            <description>Creates a Database Backup using provided Backup Entity.</description>
-        </annotations>
-        <arguments>
-            <argument name="backup" defaultValue="DatabaseBackup"/>
-        </arguments>
-
-        <click selector="{{AdminMainActionsSection.databaseBackup}}" stepKey="clickCreateBackupButton"/>
-        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
-        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
-        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
-        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database backup." stepKey="seeSuccessMessage"/>
-        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
-        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
new file mode 100644
index 0000000000000..5d4e4a19509ea
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="createDatabaseBackup">
+        <annotations>
+            <description>Creates a Database Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="DatabaseBackup"/>
+        </arguments>
+
+        <click selector="{{AdminMainActionsSection.databaseBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateMediaBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateMediaBackupActionGroup.xml
new file mode 100644
index 0000000000000..ffa66ae230c04
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateMediaBackupActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="CreateMediaBackupActionGroup">
+        <annotations>
+            <description>Creates a Media Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="MediaBackup"/>
+        </arguments>
+
+        <click selector="{{AdminMainActionsSection.mediaBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database and media backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateSystemBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateSystemBackupActionGroup.xml
new file mode 100644
index 0000000000000..ca4f7ad1544df
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateSystemBackupActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="CreateSystemBackupActionGroup">
+        <annotations>
+            <description>Creates a System Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="SystemBackup"/>
+        </arguments>
+
+        <click selector="{{AdminMainActionsSection.systemBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForElementNotVisible selector=".loading-mask" time="300" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the system backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
index 26f8817c0a1bb..778c6d5112b6a 100644
--- a/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml
@@ -30,13 +30,13 @@
         <waitForPageLoad stepKey="waitForBackupPage"/>
 
         <!--Create system backup-->
-        <actionGroup ref="createSystemBackup" stepKey="createSystemBackup"/>
+        <actionGroup ref="CreateSystemBackupActionGroup" stepKey="createSystemBackup"/>
 
         <!--Create database/media backup-->
-        <actionGroup ref="createMediaBackup" stepKey="createMediaBackup"/>
+        <actionGroup ref="CreateMediaBackupActionGroup" stepKey="createMediaBackup"/>
 
         <!--Create database backup-->
-        <actionGroup ref="createDatabaseBackup" stepKey="createDatabaseBackup"/>
+        <actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
 
         <!--Delete system backup-->
         <actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">

From 96e4a24e00895aa3f58e81cacd6e8dbac4b5cb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@gmail.com>
Date: Thu, 28 Nov 2019 13:03:02 +0100
Subject: [PATCH 2/3] FIX: Issues when building the project (missing rename)

---
 .../Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
index 5d4e4a19509ea..171bdb88dc428 100644
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/CreateDatabaseBackupActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="createDatabaseBackup">
+    <actionGroup name="CreateDatabaseBackupActionGroup">
         <annotations>
             <description>Creates a Database Backup using provided Backup Entity.</description>
         </annotations>

From 4584cabf5f11cb422f9735f12f552e471e69644d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@gmail.com>
Date: Wed, 4 Dec 2019 21:34:39 +0100
Subject: [PATCH 3/3] BACKWARD COMPATIBILITY: Deprecated ActionGroups to make
 change Backward Compatible.

---
 .../ActionGroup/_Deprecated_ActionGroup.xml   | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml
new file mode 100644
index 0000000000000..84c6812ddf183
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<!--
+NOTICE: Action Groups in this file are DEPRECATED and SHOULD NOT BE USED anymore.
+        Please find the Comment with proper replacement for each of ActionGroups provided.
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="createSystemBackup">
+        <annotations>
+            <description>Creates a System Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="SystemBackup"/>
+        </arguments>
+        <!-- NOTICE: This ActionGroup is DEPRECATED! Use `CreateSystemBackupActionGroup` instead -->
+        <click selector="{{AdminMainActionsSection.systemBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForElementNotVisible selector=".loading-mask" time="300" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the system backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+
+    <actionGroup name="createMediaBackup">
+        <annotations>
+            <description>Creates a Media Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="MediaBackup"/>
+        </arguments>
+        <!-- NOTICE: This ActionGroup is DEPRECATED! Use `CreateMediaBackupActionGroup` instead -->
+        <click selector="{{AdminMainActionsSection.mediaBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database and media backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+
+    <actionGroup name="createDatabaseBackup">
+        <annotations>
+            <description>Creates a Database Backup using provided Backup Entity.</description>
+        </annotations>
+        <arguments>
+            <argument name="backup" defaultValue="DatabaseBackup"/>
+        </arguments>
+        <!-- NOTICE: This ActionGroup is DEPRECATED! Use `CreateDatabaseBackupActionGroup` instead -->
+        <click selector="{{AdminMainActionsSection.databaseBackup}}" stepKey="clickCreateBackupButton"/>
+        <waitForElementVisible selector="{{AdminCreateBackupFormSection.backupNameField}}" stepKey="waitForForm"/>
+        <fillField selector="{{AdminCreateBackupFormSection.backupNameField}}" userInput="{{backup.name}}" stepKey="fillBackupName"/>
+        <click selector="{{AdminCreateBackupFormSection.ok}}" stepKey="clickOk"/>
+        <waitForPageLoad time="120" stepKey="waitForBackupProcess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the database backup." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
+        <see selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" userInput="{{backup.type}}" stepKey="seeBackupType"/>
+    </actionGroup>
+</actionGroups>