From a8f4a8b88b19d42ca703f07916e34ee869d0ae0c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 1 Mar 2021 13:37:48 +0200
Subject: [PATCH 1/4] MC-41101: [MFTF][MSI]
 AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest
 is flaky because of bad design

---
 ...OffForGroupedProductOnDefaultStockTest.xml | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
index da6c84ffe940..58decb3f2e7a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
@@ -30,9 +30,7 @@
                 <requiredEntity createDataKey="additionalSource"/>
             </createData>
             <createData entity="SimpleSubCategory" stepKey="category"/>
-            <createData entity="GroupedProduct" stepKey="groupedProduct">
-                <field key="name">CustomGroupedProduct</field>
-            </createData>
+            <createData entity="GroupedProduct" stepKey="groupedProduct"/>
             <createData entity="SimpleProduct" stepKey="simpleProduct">
                 <requiredEntity createDataKey="category"/>
             </createData>
@@ -44,7 +42,7 @@
         <after>
             <!--Disable additional source.-->
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableAdditionalSource">
-                <argument name="sourceCode" value="$$additionalSource.source[source_code]$$"/>
+                <argument name="sourceCode" value="$additionalSource.source[source_code]$"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <!--Clean up created data.-->
@@ -57,25 +55,25 @@
 
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductGrid2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct2">
-            <argument name="product" value="$$groupedProduct$$"/>
+            <argument name="product" value="$groupedProduct$"/>
         </actionGroup>
 
         <actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup"  stepKey="openSecondProductForEdit"/>
         <actionGroup ref="AdminAssignProductToGroupActionGroup" stepKey="addFirstSimpleToGroup">
-            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="product" value="$simpleProduct$"/>
         </actionGroup>
 
         <actionGroup ref="FillDefaultQuantityForLinkedToGroupProductInGridActionGroup" stepKey="fillDefaultQtyForVirtualProduct1">
-            <argument name="productName" value="$$simpleProduct.name$$"/>
+            <argument name="productName" value="$simpleProduct.name$"/>
             <argument name="qty" value="2"/>
         </actionGroup>
 
         <actionGroup ref="AdminAssignProductToGroupActionGroup" stepKey="addSecondSimpleToGroup">
-            <argument name="product" value="$$virtualProduct$$"/>
+            <argument name="product" value="$virtualProduct$"/>
         </actionGroup>
 
         <actionGroup ref="FillDefaultQuantityForLinkedToGroupProductInGridActionGroup" stepKey="fillDefaultQtyForVirtualProduct2">
-            <argument name="productName" value="$$virtualProduct.name$$"/>
+            <argument name="productName" value="$virtualProduct.name$"/>
             <argument name="qty" value="2"/>
         </actionGroup>
 
@@ -83,22 +81,22 @@
 
         <scrollToTopOfPage stepKey="scrollOnTopOfProductPagePage"/>
         <actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignCategoryToProduct">
-            <argument name="categoryName" value="$$category.name$$"/>
+            <argument name="categoryName" value="$category.name$"/>
         </actionGroup>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
-            <argument name="phrase" value="$$groupedProduct.sku$$"/>
+            <argument name="phrase" value="$groupedProduct.name$"/>
         </actionGroup>
-        <dontSee userInput="$$groupedProduct.name$$" stepKey="verifyProductNotPresentOnStorefront"/>
+        <dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="$groupedProduct.name$" stepKey="verifyProductNotPresentOnStorefront"/>
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="manageStockToNo"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage2"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">
-            <argument name="phrase" value="$$groupedProduct.sku$$"/>
+            <argument name="phrase" value="$groupedProduct.name$"/>
         </actionGroup>
-        <see userInput="$$groupedProduct.name$$" stepKey="verifyProductPresentOnStorefront"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="$groupedProduct.name$" stepKey="verifyProductPresentOnStorefront"/>
     </test>
 </tests>

From 5b904a6335cf2a0362974a47d925d00e21c1b4be Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 1 Mar 2021 18:58:11 +0200
Subject: [PATCH 2/4] MC-41101: [MFTF][MSI]
 AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest
 is flaky because of bad design

---
 ...rationPageTurnedOffForGroupedProductOnDefaultStockTest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
index 58decb3f2e7a..49ad6b76662a 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
@@ -20,6 +20,7 @@
         </annotations>
 
         <before>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
             <!--Create test data.-->
             <createData entity="MsiCustomer1" stepKey="customer"/>
             <createData entity="FullSource1" stepKey="additionalSource"/>
@@ -37,6 +38,7 @@
             <createData entity="VirtualProduct" stepKey="virtualProduct">
                 <requiredEntity createDataKey="category"/>
             </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -91,7 +93,7 @@
         <dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="$groupedProduct.name$" stepKey="verifyProductNotPresentOnStorefront"/>
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="manageStockToNo"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <magentoCLI command="c:c" stepKey="flushCache"/>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage2"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">

From 9ef1e9867f7e00a3f6a736112ed5d1c30198492a Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 2 Mar 2021 09:21:30 +0200
Subject: [PATCH 3/4] MC-41101: [MFTF][MSI]
 AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest
 is flaky because of bad design

---
 ...urationPageTurnedOffForGroupedProductOnDefaultStockTest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
index 49ad6b76662a..3822efcf39dc 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
@@ -39,6 +39,7 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -93,7 +94,7 @@
         <dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="$groupedProduct.name$" stepKey="verifyProductNotPresentOnStorefront"/>
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="manageStockToNo"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="c:c" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache"/>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage2"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">

From c3474dac74168689df404a6c19255ecd38ab0a21 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 2 Mar 2021 09:45:18 +0200
Subject: [PATCH 4/4] MC-41101: [MFTF][MSI]
 AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest
 is flaky because of bad design

---
 ...onPageTurnedOffForGroupedProductOnDefaultStockTest.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
index 3822efcf39dc..e61618b6a518 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminManageStockOnConfigurationPageTurnedOffForGroupedProductOnDefaultStockTest.xml
@@ -39,7 +39,9 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -94,7 +96,9 @@
         <dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="$groupedProduct.name$" stepKey="verifyProductNotPresentOnStorefront"/>
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="manageStockToNo"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage2"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">