merge magento/2.3-develop into magento-honey-badgers/MC-31551

Author: magento-mts-svc

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml

@@ -445,7 +445,7 @@
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
     </actionGroup>
 
-    <actionGroup name="DeleteDefaultCategoryChildren">
+    <actionGroup name="DeleteDefaultCategoryChildren" deprecated="Use deleteData action for categories created via api. StorefrontCatalogNavigationMenuUIDesktopTest will be refactored in 2.4 to reflect this change.">
         <annotations>
             <description>Deletes all children categories of Default Root Category.</description>
         </annotations>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml

@@ -129,7 +129,7 @@
         <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
     </actionGroup>
     <!-- Assumes we are on product edit page -->
-    <actionGroup name="AdminDeleteAllProductCustomOptions">
+    <actionGroup name="AdminDeleteAllProductCustomOptions" deprecated="Use AdminDeleteProductCustomOption for each custom option created instead.">
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="expandContentTab"/>
         <waitForPageLoad time="10" stepKey="waitCustomizableOptionsTabOpened"/>
         <executeInSelenium function="function($webdriver) use ($I) {

app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml

@@ -78,7 +78,7 @@
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
     </actionGroup>
 
-    <actionGroup name="deleteAllExportedFiles">
+    <actionGroup name="deleteAllExportedFiles" deprecated="Use DeleteExportedFileActionGroup on each exported file instead.">
         <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
         <executeInSelenium
             function="

app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml

@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCatalogPriceRuleDeleteAllActionGroup">
+    <actionGroup name="AdminCatalogPriceRuleDeleteAllActionGroup" deprecated="Use RemoveCatalogPriceRule for each created rule instead.">
         <annotations>
             <description>Open Catalog Price Rule grid and delete all rules one by one. Need to avoid interference with other tests that test catalog price rules.</description>
         </annotations>

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml

@@ -88,7 +88,7 @@
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
     </actionGroup>
 
-    <actionGroup name="AdminDeleteStoreViewIfExistsActionGroup" extends="AdminSearchStoreViewByNameActionGroup">
+    <actionGroup name="AdminDeleteStoreViewIfExistsActionGroup" extends="AdminSearchStoreViewByNameActionGroup" deprecated="Use AdminDeleteStoreViewActionGroup instead.">
         <annotations>
             <description>EXTENDS: AdminSearchStoreViewByNameActionGroup. Goes to the Admin Stores grid page. Deletes the provided Store (if exists) without creating a Backup. Validates that the Success Message is present and correct.</description>
         </annotations>

composer.json

@@ -89,7 +89,7 @@
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "2.6.1",
+        "magento/magento2-functional-testing-framework": "2.6.2",
         "pdepend/pdepend": "2.5.2",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",