Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-pr23

Author: serhii-balko

app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml renamed to app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupDeleteActionGroup.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="deleteBackup">
+    <actionGroup name="AdminBackupDeleteActionGroup">
         <annotations>
             <description>Deletes a Backup using provided Backup Entity.</description>
         </annotations>

app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupIndexPageOpenActionGroup.xml

@@ -0,0 +1,14 @@
+<?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="AdminBackupIndexPageOpenActionGroup">
+        <amOnPage url="{{AdminBackupIndexPage.url}}" stepKey="navigateToBackupIndexPage"/>
+        <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml

@@ -0,0 +1,12 @@
+<?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="deleteBackup" extends="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
+</actionGroups>

app/code/Magento/Backup/Test/Mftf/Page/BackupIndexPage.xml renamed to app/code/Magento/Backup/Test/Mftf/Page/AdminBackupIndexPage.xml

@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="BackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
+    <page name="AdminBackupIndexPage" url="/backup/index/" area="admin" module="Magento_Backup">
         <section name="AdminMainActionsSection"/>
         <section name="AdminGridTableSection"/>
         <section name="AdminCreateBackupFormSection"/>

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

@@ -26,8 +26,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!--Go to backup index page-->
-        <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupPage"/>
-        <waitForPageLoad stepKey="waitForBackupPage"/>
+        <actionGroup ref="AdminBackupIndexPageOpenActionGroup" stepKey="navigateToBackupPage"/>
 
         <!--Create system backup-->
         <actionGroup ref="CreateSystemBackupActionGroup" stepKey="createSystemBackup"/>
@@ -39,17 +38,17 @@
         <actionGroup ref="CreateDatabaseBackupActionGroup" stepKey="createDatabaseBackup"/>
 
         <!--Delete system backup-->
-        <actionGroup ref="deleteBackup" stepKey="deleteSystemBackup">
+        <actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteSystemBackup">
             <argument name="backup" value="SystemBackup"/>
         </actionGroup>
 
         <!--Delete database/media backup-->
-        <actionGroup ref="deleteBackup" stepKey="deleteMediaBackup">
+        <actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteMediaBackup">
             <argument name="backup" value="MediaBackup"/>
         </actionGroup>
 
         <!--Delete database backup-->
-        <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
+        <actionGroup ref="AdminBackupDeleteActionGroup" stepKey="deleteDatabaseBackup">
             <argument name="backup" value="DatabaseBackup"/>
         </actionGroup>
 

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml

@@ -84,7 +84,7 @@
         <see selector="{{StorefrontMinicartSection.productPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
 
         <!-- Assert that the rule isn't present on the Checkout page -->
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout1"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout1"/>
         <conditionalClick selector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" dependentSelector="{{CheckoutCartSummarySection.expandShoppingCartSummary}}" visible="true" stepKey="expandShoppingCartSummary1"/>
         <see selector="{{CheckoutCartProductSection.ProductRegularPriceByName($$createProduct1.name$$)}}" userInput="$$createProduct1.price$$" stepKey="seeCorrectProductPriceOnCheckout1"/>
     </test>

app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml

@@ -36,6 +36,7 @@
         <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
         <element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
         <element name="emptyCart" type="text" selector=".counter.qty.empty"/>
+        <element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
         <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
         <element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
         <element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml renamed to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

@@ -78,7 +78,7 @@
 
         <!-- Verify mini cart is empty -->
         <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertEmptryCart">
-            <argument name="selector" value="{{StorefrontMiniCartSection.emptyMiniCart}}"/>
+            <argument name="selector" value="{{StorefrontMinicartSection.emptyMiniCart}}"/>
         </actionGroup>
     </test>
 </tests>

app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml

@@ -89,7 +89,7 @@
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
 
         <!-- Assert Empty Mini Cart -->
-        <seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}"  stepKey="assertEmptyCart" />
+        <seeElement selector="{{StorefrontMinicartSection.emptyMiniCart}}"  stepKey="assertEmptyCart" />
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Register customer after checkout -->