Merge branch '2.4-develop' of https://github.com/magento/magento2ce i…

…nto B2B-272

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

@@ -54,7 +54,7 @@
         <comment userInput="Add product to the shopping cart" stepKey="addProductToCart"/>
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
             <argument name="productName" value="$$createProduct.name$$"/>
         </actionGroup>
         <!--Go to Checkout-->
@@ -76,7 +76,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
         <!-- Search for Order in the order grid -->
         <comment userInput="Search for Order in the order grid" stepKey="searchOrderInGrid"/>
-        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+        <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
         <waitForLoadingMaskToDisappear stepKey="waitForSearchingOrder"/>

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="CreateDatabaseBackupActionGroup">
+        <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>

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>

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>

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">

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminCreateNewRoleActionGroup.xml

@@ -0,0 +1,32 @@
+<?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="AdminCreateNewRoleActionGroup">
+        <annotations>
+            <description>Creates a User Role using the provided Data.</description>
+        </annotations>
+        <arguments>
+            <argument name="role" type="string" defaultValue=""/>
+            <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
+        </arguments>
+
+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You saved the role." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml

@@ -0,0 +1,27 @@
+<?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="AdminDeleteRoleActionGroup">
+        <annotations>
+            <description>Deletes a User Role that contains the text 'Role'. PLEASE NOTE: The Action Group values are Hardcoded.</description>
+        </annotations>
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
+
+        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.theRole}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
+        <waitForAjaxLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+    </actionGroup>
+</actionGroups>