Merge branch 'ACQE-8744' into ACQE-functional-deployment-v4-2

Author: Karishmathakare19

app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

@@ -330,4 +330,7 @@
         <data key="url_path">catalog/seo/category_url_suffix</data>
         <data key="url_suffix">.html</data>
     </entity>
+    <entity name="ImportCategoryFromCSV" type="category">
+        <data key="name">simpleCategory5d53a993b7ccb2</data>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml

@@ -24,6 +24,12 @@
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteSimpleSubCategory">
+                <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteFirstLevelSubCategory">
+                <argument name="categoryName" value="{{FirstLevelSubCat.name}}"/>
+            </actionGroup>
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
             <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/Catalog/Test/Mftf/Test/CreateAnchorCategoryTest.xml

@@ -33,11 +33,8 @@
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="createProductA" stepKey="deleteProductA"/>
-            <deleteData createDataKey="createProductB" stepKey="deleteProductB"/>
-            <deleteData createDataKey="createProductC" stepKey="deleteProductC"/>
-            <deleteData createDataKey="createProductD" stepKey="deleteProductD"/>
-            <deleteData createDataKey="createProductE" stepKey="deleteProductE"/>
+            <!-- Delete all products via API -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createCategoryA" stepKey="deleteCategoryA"/>
         </after>
 

app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml

@@ -26,6 +26,10 @@
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
             <actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="resetProductFilters"/>
+            <!--Clean up categories-->
+            <actionGroup ref="DeleteCategoryActionGroup" stepKey="cleanSimpleSubCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <magentoCLI command="config:set checkout/options/enable_guest_checkout_login 0" stepKey="DisablingGuestCheckoutLogin"/>
         </after>
@@ -253,11 +257,6 @@
         </actionGroup>
 
         <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
-        <!--Clean up categories-->
-        <comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
-        <actionGroup ref="DeleteCategoryActionGroup" stepKey="cleanSimpleSubCategory">
-            <argument name="categoryEntity" value="SimpleSubCategory"/>
-        </actionGroup>
         <!--Clean up products-->
         <comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
         <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteSimpleProduct">

app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -38,6 +38,9 @@
                 <argument name="productName" value="simpleProductWithShortNameAndSku.name"/>
             </actionGroup>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteImportCategory">
+                <argument name="categoryName" value="{{ImportCategoryFromCSV.name}}"/>
+            </actionGroup>
             <!--Delete attribute-->
             <deleteData createDataKey="productAttribute" stepKey="deleteProductAttribute"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>

app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifyMultipleProductRatingsOnCategoryPageTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -43,15 +43,14 @@
                 <argument name="customerEmail" value="CustomerEntityOne.email"/>
             </actionGroup>
             <!-- delete Category and Products -->
-            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
-            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <!-- Logout -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <!-- Disable single store view back -->
             <magentoCLI command="config:set general/single_store_mode/enabled 0" stepKey="enabledSingleStoreMode"/>
         </after>
-        
+
         <!-- Go to frontend and make a user account and login with it -->
         <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="signUpNewUser">
             <argument name="Customer" value="CustomerEntityOne"/>