From 6bb81585f10eb347cd4f35c9a286eab0a2d82d39 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 6 Nov 2020 18:37:18 +0200
Subject: [PATCH 1/6] AddOutOfStockProductToCompareListTest refactored

---
 ...tHoverProductOnCategoryPageActionGroup.xml |  19 +++
 .../AddOutOfStockProductToCompareListTest.xml | 120 ++++++++----------
 2 files changed, 72 insertions(+), 67 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..661d40fd4f13a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontHoverProductOnCategoryPageActionGroup">
+        <annotations>
+            <description>Hover product on the Category page</description>
+        </annotations>
+
+    <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index 92be79fdfe720..b2fbf2ae3810a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -20,7 +20,6 @@
             <group value="Catalog"/>
         </annotations>
         <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
@@ -30,81 +29,68 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
         </before>
+
         <after>
-            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
+           <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/> 
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
             </actionGroup>
-            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/> 
+            <deleteData createDataKey="category" stepKey="deleteCategory"/> 
         </after>
-        <!--Open product page-->
-        <comment userInput="Open product page" stepKey="openProdPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-        <!--'Add to compare' link is not available-->
-        <comment userInput="'Add to compare' link is not available" stepKey="addToCompareLinkAvailability"/>
+
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
+            <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
-        <!--Turn on 'out on stock' config-->
-        <comment userInput="Turn on 'out of stock' config" stepKey="onOutOfStockConfig"/>
+      
         <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
-        <!--Clear cache and reindex-->
-        <comment userInput="Clear cache and reindex" stepKey="cleanCache"/>
+  
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-    <argument name="indices" value=""/>
-</actionGroup>
+           <argument name="indices" value=""/>
+        </actionGroup>
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
-    <argument name="tags" value=""/>
-</actionGroup>
-        <!--Open product page-->
-        <comment userInput="Open product page" stepKey="openProductPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage2"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage2"/>
-        <!--Click on 'Add to Compare' link-->
-        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="seeAddToCompareLink"/>
-        <comment userInput="Click on 'Add to Compare' link" stepKey="clickOnAddToCompareLink"/>
-        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickOnAddToCompare"/>
-        <waitForPageLoad stepKey="waitForProdAddToCmpList"/>
-        <!--Assert success message-->
-        <comment userInput="Assert success message" stepKey="assertSuccessMsg"/>
-        <grabTextFrom selector="{{StorefrontMessagesSection.success}}" stepKey="grabTextFromSuccessMessage"/>
-        <assertEquals stepKey="assertSuccessMessage">
-			<actualResult type="const">($grabTextFromSuccessMessage)</actualResult>
-			<expectedResult type="string">You added product $$product.name$$ to the comparison list.</expectedResult>
-        </assertEquals>
-        <!--See product in the comparison list-->
-        <comment userInput="See product in the comparison list" stepKey="seeProductInComparisonList"/>
-        <amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage"/>
-        <waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad"/>
-        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList"/>
-        <!--Go to Category page and delete product from comparison list-->
-        <comment userInput="Go to Category page and delete product from comparison list" stepKey="deleteProdFromCmpList"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="onCategoryPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-        <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
-        <waitForPageLoad time="30" stepKey="waitForConfirmPageLoad"/>
-        <click selector="{{AdminDeleteRoleSection.confirm}}" stepKey="confirmProdDelate"/>
-        <waitForPageLoad time="30" stepKey="waitForConfirmLoad"/>
-        <!--Add product to compare list from Category page-->
-        <comment userInput="Add product to compare list fom Category page" stepKey="addToCmpFromCategPage"/>
-        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
-        <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickAddToCompare"/>
-        <waitForPageLoad stepKey="waitProdAddingToCmpList"/>
-        <!--Assert success message-->
-        <comment userInput="Assert success message" stepKey="assertSuccessMsg2"/>
-        <grabTextFrom selector="{{StorefrontMessagesSection.success}}" stepKey="grabTextFromSuccessMessage2"/>
-        <assertEquals stepKey="assertSuccessMessage2">
-			<actualResult type="const">($grabTextFromSuccessMessage)</actualResult>
-			<expectedResult type="string">You added product $$product.name$$ to the comparison list.</expectedResult>
-        </assertEquals>
-        <!--Check that product displays on add to compare widget-->
-        <comment userInput="Check that product displays on add to compare widget" stepKey="checkProdNameOnWidget"/>
+           <argument name="tags" value=""/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront1">
+            <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
+        </actionGroup>
+       
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare1">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
+         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage"/>
+
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList">
+          <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+    
+       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage1">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearList"/>
+
+        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverProduct"/>
+
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare2">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+    
         <seeElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName($$product.name$$)}}" stepKey="seeProdNameOnCmpWidget"/>
-        <!--See product in the compare page-->
-        <comment userInput="See product in the compare page" stepKey="seeProductInComparePage"/>
-        <amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage2"/>
-        <waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad2"/>
-        <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList2"/>
+
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage1"/>
+       
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList1">
+             <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
     </test>
 </tests>

From 1089f15b276cbbe30c2279349a934716148321be Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Thu, 19 Nov 2020 19:08:10 +0200
Subject: [PATCH 2/6] restoring stepKeys

---
 .../AddOutOfStockProductToCompareListTest.xml | 60 ++++++++++++++-----
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index b2fbf2ae3810a..c28c5a040e553 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -38,15 +38,21 @@
             <deleteData createDataKey="product" stepKey="deleteProduct"/> 
             <deleteData createDataKey="category" stepKey="deleteCategory"/> 
         </after>
+        <comment userInput="Open product page | Comment is kept to preserve the step key for backward compatibility" stepKey="openProdPage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToSimpleProductPage"/>
 
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="waitForSimpleProductPage">
             <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
         </actionGroup>
-        
+
+        <comment userInput="'Add to compare' link is not available | Comment is kept to preserve the step key for backward compatibility" stepKey="addToCompareLinkAvailability"/>
+
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
       
+        <comment userInput="Turn on 'out of stock' config | Comment is kept to preserve the step key for backward compatibility" stepKey="onOutOfStockConfig"/>
         <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
   
+        <comment userInput="Clear cache and reindex | Comment is kept to preserve the step key for backward compatibility" stepKey="cleanCache"/>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
            <argument name="indices" value=""/>
         </actionGroup>
@@ -54,41 +60,67 @@
            <argument name="tags" value=""/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront1">
+        <comment userInput="Open product page | Comment is kept to preserve the step key for backward compatibility" stepKey="openProductPage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToSimpleProductPage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSimpleProductPage2"/>
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="seeAddToCompareLink">
             <argument name="productUrl" value="$$product.custom_attributes[url_key]$$"/>
         </actionGroup>
+
+        <comment userInput="Click on 'Add to Compare' link | Comment is kept to preserve the step key for backward compatibility" stepKey="clickOnAddToCompareLink"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnAddToCompare"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProdAddToCmpList"/>
+        <comment userInput="Assert success message | Comment is kept to preserve the step key for backward compatibility" stepKey="assertSuccessMsg"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage"/>
        
-        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare1">
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="assertSuccessMessage">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>
 
-         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
+        <comment userInput="See product in the comparison list | Comment is kept to preserve the step key for backward compatibility" stepKey="seeProductInComparisonList"/>
+       
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="navigateToComparePage"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad"/>
 
-        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList">
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList">
           <argument name="productVar" value="$$product$$"/>
         </actionGroup>
     
-       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage1">
+
+       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deleteProdFromCmpList"/>
+       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onCategoryPage"/>
+       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="waitForPageLoad1">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearList"/>
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clickClearAll"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForConfirmPageLoad"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="confirmProdDelate"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForConfirmLoad"/>
+        <comment userInput="Add product to compare list fom Category page | Comment is kept to preserve the step key for backward compatibility" stepKey="addToCmpFromCategPage"/>
 
-        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverProduct"/>
+        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverOverProduct"/>
 
-        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="addProductToCompare2">
+        <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="clickAddToCompare">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>
-    
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitProdAddingToCmpList"/>
+        <comment userInput="Assert success message | Comment is kept to preserve the step key for backward compatibility" stepKey="assertSuccessMsg2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertSuccessMessage2"/>
+
+        <comment userInput="Check that product displays on add to compare widget | Comment is kept to preserve the step key for backward compatibility" stepKey="checkProdNameOnWidget"/> 
         <seeElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName($$product.name$$)}}" stepKey="seeProdNameOnCmpWidget"/>
 
-        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="compareOpenComparePage1"/>
+        <comment userInput="See product in the compare page" stepKey="seeProductInComparePage"/>
+        <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="navigateToComparePage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad2"/>
        
-        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInComparisonList1">
+        <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList2">
              <argument name="productVar" value="$$product$$"/>
         </actionGroup>
 

From 7320189463af8d2a08f6138e524ed4838195d179 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Mon, 30 Nov 2020 17:15:08 +0200
Subject: [PATCH 3/6] refactored

---
 .../Mftf/Test/AddOutOfStockProductToCompareListTest.xml  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index c28c5a040e553..d8545c94010dc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -87,13 +87,12 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad"/>
 
         <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList">
-          <argument name="productVar" value="$$product$$"/>
+            <argument name="productVar" value="$$product$$"/>
         </actionGroup>
-    
 
-       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deleteProdFromCmpList"/>
-       <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onCategoryPage"/>
-       <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="waitForPageLoad1">
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deleteProdFromCmpList"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="onCategoryPage"/>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="waitForPageLoad1">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 

From 8ba2695458f6c686a1caafb5cd629b0f67a85f10 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Tue, 1 Dec 2020 08:57:26 +0200
Subject: [PATCH 4/6] fixed indentation

---
 .../StorefrontHoverProductOnCategoryPageActionGroup.xml       | 4 ++--
 .../Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml
index 661d40fd4f13a..10d85a91a02c6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontHoverProductOnCategoryPageActionGroup.xml
@@ -10,10 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontHoverProductOnCategoryPageActionGroup">
         <annotations>
-            <description>Hover product on the Category page</description>
+           <description>Hover product on the Category page</description>
         </annotations>
 
-    <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
 
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index d8545c94010dc..8911e5d04fe4a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -31,7 +31,7 @@
         </before>
 
         <after>
-           <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/> 
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
             </actionGroup>

From d001c99173bbf407587b4ece8f8d51fec6e4f56c Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Tue, 1 Dec 2020 09:00:50 +0200
Subject: [PATCH 5/6] fixed indentation

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index 8911e5d04fe4a..7f4228a21f3d5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -120,7 +120,7 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad2"/>
        
         <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList2">
-             <argument name="productVar" value="$$product$$"/>
+            <argument name="productVar" value="$$product$$"/>
         </actionGroup>
 
     </test>

From 125b01a296c165afd53d8f13ceb35b0e13716702 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 18 Dec 2020 11:52:56 +0200
Subject: [PATCH 6/6] magento/magento2#31131: [MFTF] Refactoring of
 AddOutOfStockProductToCompareListTest.

---
 .../AddOutOfStockProductToCompareListTest.xml  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index 7f4228a21f3d5..995fa4c7e5977 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -20,6 +20,7 @@
             <group value="Catalog"/>
         </annotations>
         <before>
+            <comment userInput="Adding the comment for preserving Backward Compatibility" stepKey="loginAsAdmin"/>
             <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
@@ -35,8 +36,9 @@
             <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
                 <argument name="tags" value=""/>
             </actionGroup>
-            <deleteData createDataKey="product" stepKey="deleteProduct"/> 
-            <deleteData createDataKey="category" stepKey="deleteCategory"/> 
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <comment userInput="Adding the comment for preserving Backward Compatibility"  stepKey="logout"/>
         </after>
         <comment userInput="Open product page | Comment is kept to preserve the step key for backward compatibility" stepKey="openProdPage"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="goToSimpleProductPage"/>
@@ -48,10 +50,10 @@
         <comment userInput="'Add to compare' link is not available | Comment is kept to preserve the step key for backward compatibility" stepKey="addToCompareLinkAvailability"/>
 
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
-      
+
         <comment userInput="Turn on 'out of stock' config | Comment is kept to preserve the step key for backward compatibility" stepKey="onOutOfStockConfig"/>
         <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
-  
+
         <comment userInput="Clear cache and reindex | Comment is kept to preserve the step key for backward compatibility" stepKey="cleanCache"/>
         <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
            <argument name="indices" value=""/>
@@ -72,13 +74,13 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProdAddToCmpList"/>
         <comment userInput="Assert success message | Comment is kept to preserve the step key for backward compatibility" stepKey="assertSuccessMsg"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage"/>
-       
+
         <actionGroup ref="StorefrontAddProductToCompareActionGroup" stepKey="assertSuccessMessage">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>
 
         <comment userInput="See product in the comparison list | Comment is kept to preserve the step key for backward compatibility" stepKey="seeProductInComparisonList"/>
-       
+
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
@@ -112,13 +114,13 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSuccessMessage2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertSuccessMessage2"/>
 
-        <comment userInput="Check that product displays on add to compare widget | Comment is kept to preserve the step key for backward compatibility" stepKey="checkProdNameOnWidget"/> 
+        <comment userInput="Check that product displays on add to compare widget | Comment is kept to preserve the step key for backward compatibility" stepKey="checkProdNameOnWidget"/>
         <seeElement selector="{{StorefrontComparisonSidebarSection.ProductTitleByName($$product.name$$)}}" stepKey="seeProdNameOnCmpWidget"/>
 
         <comment userInput="See product in the compare page" stepKey="seeProductInComparePage"/>
         <actionGroup ref="StorefrontOpenAndCheckComparisionActionGroup" stepKey="navigateToComparePage2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForStorefrontProductComparePageLoad2"/>
-       
+
         <actionGroup ref="SeeProductInComparisonListActionGroup" stepKey="seeProductInCompareList2">
             <argument name="productVar" value="$$product$$"/>
         </actionGroup>