From e6a3bee7dfbf17456e768a77d78e8e9a1b5bf133 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Fri, 31 Jan 2020 11:30:41 +0100
Subject: [PATCH 01/17] #26607 Fix failing CI due to missing
 "createSimpleProductApi"

---
 app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 46bb6e527608f..91431820dd563 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -136,6 +136,7 @@
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
+        <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleProduct3" type="product">

From e26a536d1960253dfa2242b5793a6c805413a9ca Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Fri, 31 Jan 2020 13:34:50 +0100
Subject: [PATCH 02/17] #26607 Additional changes that make Test more stable

---
 .../Magento/Catalog/Test/Mftf/Data/ProductData.xml    |  2 +-
 .../ActionGroup/OpenCatalogPriceRuleActionGroup.xml   |  1 +
 .../Mftf/Test/AdminReorderWithCatalogPriceTest.xml    | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 91431820dd563..b160d958f423b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -128,7 +128,7 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProduct2" type="product">
-        <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="sku" unique="suffix">simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="name" unique="suffix">SimpleProduct</data>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
index c810d9579df92..68ce445d991b3 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/OpenCatalogPriceRuleActionGroup.xml
@@ -13,6 +13,7 @@
             <argument name="ruleName" type="string" defaultValue="CustomCatalogRule.name"/>
         </arguments>
         <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogPriceRuleGridPageLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
         <fillField selector="{{AdminCatalogPriceRuleGridSection.filterByRuleName}}" userInput="{{ruleName}}" stepKey="filterByRuleName"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
index dc74e024b2629..f5489b82520f7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
@@ -20,10 +20,13 @@
             <group value="catalogRule"/>
         </annotations>
         <before>
-            <!--Create the catalog price rule -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
             <createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
-            <!--Create product-->
             <createData entity="SimpleProduct2" stepKey="createSimpleProductApi"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
             <!--Create order via API-->
             <createData entity="GuestCart" stepKey="createGuestCart"/>
             <createData entity="SimpleCartItem" stepKey="addCartItem">
@@ -36,8 +39,6 @@
             <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
                 <requiredEntity createDataKey="createGuestCart"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <!--END Create order via API-->
         </before>
         <after>
@@ -52,8 +53,6 @@
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!-- Login as admin -->
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         <!--Open order page by Id-->
         <amOnPage url="{{AdminOrderPage.url($createGuestCart.return$)}}" stepKey="navigateToOrderPage"/>
         <waitForPageLoad stepKey="waitForCreatedOrderPage"/>

From 075f9f4d16a723095e1a0e77599e5e56fb78796d Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 02:07:14 +0100
Subject: [PATCH 03/17] Trigger cron execution on `index` group to show
 products

---
 .../AdminEditRelatedBundleProductTest.xml     |  2 +
 .../Test/StorefrontEditBundleProductTest.xml  |  2 +
 ...ConfigurableSetEditRelatedProductsTest.xml |  1 +
 .../Mftf/Test/StorefrontTaxQuoteCartTest.xml  |  4 ++
 .../Test/StorefrontTaxQuoteCheckoutTest.xml   | 40 +++++++++++--------
 ...eProductFromShoppingCartToWishlistTest.xml |  3 +-
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 632ba194cf8de..fbb9dda50f0d9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -70,6 +70,8 @@
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
         <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 9dbd6e26bddc4..3a40a1b7eeb71 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -65,6 +65,8 @@
         <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
         <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!-- Go to the storefront bundled product page -->
         <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
index bba8232139d69..a0f8da074536f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
@@ -21,6 +21,7 @@
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete configurable product -->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index f0fac38a6c05c..6cda9ea88119b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -275,6 +275,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -385,6 +387,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index e0e411a04d484..050ab3889984b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -41,6 +41,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -146,14 +148,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -186,6 +181,15 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
+        <!-- Fill out form for a new user with address -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+
         <!-- Go to the created product page and add it to the cart -->
         <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage"/>
@@ -265,6 +269,8 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -381,14 +387,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -421,6 +420,15 @@
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
+        <!-- Fill out form for a new user with address -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+            <argument name="Customer" value="Simple_US_Customer_NY"/>
+        </actionGroup>
+
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+
         <!-- Go to the created product page and add it to the cart -->
         <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
         <waitForPageLoad stepKey="waitForVirtualProductPage"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
index 3a823efbcdf61..446c06ee1070c 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -52,8 +52,7 @@
             <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
             <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete data -->

From dab9463a523d51648b36bab7bbc26364bf23f944 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 11:23:17 +0100
Subject: [PATCH 04/17] Trigger cron execution on `index` group to show
 products

---
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml    | 2 ++
 .../Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml    | 1 +
 .../Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml     | 1 +
 .../Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml   | 2 ++
 .../Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml   | 2 ++
 .../Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml   | 1 +
 6 files changed, 9 insertions(+)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index dc8cb24246567..5ccd4d97555bb 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -22,6 +22,8 @@
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete the bundled product -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 0c0b8751a732e..f919bd15ac9eb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -27,6 +27,7 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!-- Delete simple product -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index ae7b8d2446380..14fce9d4edf7c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -21,6 +21,7 @@
         <before>
             <!--Create a product-->
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
             <!--Delete created data-->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
index a09076b7dc06e..27d505e070f5b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
@@ -34,6 +34,8 @@
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{DownloadableProduct.sku}}.html" stepKey="goToStorefront"/>
     </test>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
index fdffd286d632f..a0698224b780c 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
@@ -34,6 +34,8 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
 
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
         <!--See related product in storefront-->
         <amOnPage url="{{GroupedProduct.sku}}.html" stepKey="goToStorefront"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 6cda9ea88119b..e7bf7702328c0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -41,6 +41,7 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
             <!-- Fill out form for a new user with address -->
             <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">

From fe153fbd5eccef22c562016c4cac1ba4194e8abd Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 11:38:51 +0100
Subject: [PATCH 05/17] Wait for Customer Section load

---
 .../Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index 4260417b46fd0..e51a301212055 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -17,6 +17,7 @@
         </arguments>
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAccountLink">
         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
         <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>

From c9d83d7f74c5e7472c261c7e4ec057af5989c372 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 15:36:36 +0100
Subject: [PATCH 06/17] Extend Credit Card expiration date for another 4 years

---
 .../app/Magento/Braintree/Test/Repository/CreditCard.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
index dc02e2424b827..83ab138dacf55 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/CreditCard.xml
@@ -11,7 +11,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000000000000002</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">20</field>
+            <field name="cc_exp_year" xsi:type="string">24</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -19,7 +19,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000000000000028</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -27,7 +27,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4000111111111511</field>
             <field name="cc_exp_month" xsi:type="string">01</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -35,7 +35,7 @@
             <field name="payment_code" xsi:type="string">braintree</field>
             <field name="cc_number" xsi:type="string">4111111111111111</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
         </dataset>
     </repository>
 </config>

From 148011a08aa169f11c9228797ecca6d048ae2aea Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 16:27:08 +0100
Subject: [PATCH 07/17] Fix invalid XML syntax

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

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index e51a301212055..3cb37a248aa30 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -17,7 +17,7 @@
         </arguments>
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAccountLink">
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="waitForCreateAccountLink"/>
         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
         <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>

From 2bdbf8b2c15873f8c0ff60bf7cfb279ce6f4039c Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 17:51:33 +0100
Subject: [PATCH 08/17] Reindex after creating Bundle product

---
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index 5ccd4d97555bb..3aa0784f3fa55 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -91,6 +91,9 @@
 
         <!-- Save product and go to storefront -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+
+        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexerAfterBundle"/>
+
         <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
         <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>

From 8450dc970f11713342984102970ac75d7aac9fc1 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 18:41:09 +0100
Subject: [PATCH 09/17] Add <wait> before running cron, as simultaneously
 running workers are overlapping Cron executions

---
 .../AdminEditRelatedBundleProductTest.xml     |   1 +
 ...rontCheckBundleProductOptionTierPrices.xml |   4 +-
 ...tCustomerSelectAndSetBundleOptionsTest.xml |   2 +
 .../Test/StorefrontEditBundleProductTest.xml  |   1 +
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 140 +++++++++---------
 .../AdminSimpleSetEditRelatedProductsTest.xml |   2 +
 ...ntOnePageCheckoutDataWhenChangeQtyTest.xml |   2 +
 ...ConfigurableSetEditRelatedProductsTest.xml |   2 +
 ...DownloadableSetEditRelatedProductsTest.xml |   1 +
 ...AdminGroupedSetEditRelatedProductsTest.xml |   1 +
 .../Mftf/Test/StorefrontTaxQuoteCartTest.xml  |   2 +
 .../Test/StorefrontTaxQuoteCheckoutTest.xml   |   2 +
 ...eProductFromShoppingCartToWishlistTest.xml |   2 +
 ...eProductFromShoppingCartToWishlistTest.xml |   5 +-
 14 files changed, 93 insertions(+), 74 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index fbb9dda50f0d9..8a7e3b8344f86 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -70,6 +70,7 @@
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
         <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
 
+        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
index 0487668c10094..8e482ea8f1551 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
@@ -44,8 +44,8 @@
             </actionGroup>
             <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
 
-            <!-- Run reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <wait stepKey="waitBeforeIndexer" time="60"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <deleteData createDataKey="createBundleProductCreateBundleProduct" stepKey="deleteDynamicBundleProduct"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index 3aa0784f3fa55..68b2eda76c569 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -23,6 +23,7 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
 
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
@@ -92,6 +93,7 @@
         <!-- Save product and go to storefront -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
+        <wait stepKey="waitBeforeIndexerAfterBundle" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexerAfterBundle"/>
 
         <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 3a40a1b7eeb71..8a9a01809f015 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -65,6 +65,7 @@
         <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
         <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
+        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!-- Go to the storefront bundled product page -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index b160d958f423b..653a326e1c98b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -9,13 +9,13 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultProduct" type="product">
+        <data key="name" unique="suffix">testProductName</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <data key="weight">1</data>
@@ -23,13 +23,13 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="ApiSimpleProduct" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -55,15 +55,15 @@
         <data key="urlKey" unique="suffix">api-simple-product</data>
     </entity>
     <entity name="SimpleProduct" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
-        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
@@ -72,10 +72,10 @@
         <data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
     </entity>
     <entity name="SimpleProductBeforeUpdate" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku">simpleProduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -86,10 +86,10 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport1" type="product">
+        <data key="name">SimpleProductAfterImport1</data>
         <data key="sku">SimpleProductForTest1</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport1</data>
         <data key="price">250.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -100,38 +100,38 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport2" type="product">
+        <data key="name">SimpleProductAfterImport2</data>
         <data key="sku">SimpleProductForTest2</data>
+        <data key="urlKey">simple-product-for-test-2</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport2</data>
         <data key="price">300.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
-        <data key="urlKey">simple-product-for-test-2</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductAfterImport3" type="product">
+        <data key="name">SimpleProductAfterImport3</data>
         <data key="sku">SimpleProductForTest3</data>
+        <data key="urlKey">simple-product-for-test-3</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProductAfterImport3</data>
         <data key="price">350.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
-        <data key="urlKey">simple-product-for-test-3</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProduct2" type="product">
-        <data key="sku" unique="suffix">simple-product</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -140,10 +140,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleProduct3" type="product">
+        <data key="name" unique="suffix">simple</data>
         <data key="sku" unique="suffix">simple</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">simple</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -153,59 +153,59 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProduct4" type="product">
+        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleOutOfStockProduct" type="product">
+        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">OutOfStockProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
     </entity>
     <entity name="SimpleProductInStockQuantityZero" type="product">
+        <data key="name" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">SimpleProductInStockQuantityZero</data>
         <data key="status">1</data>
         <data key="quantity">0</data>
         <requiredEntity type="product_extension_attribute">EavStock0</requiredEntity>
     </entity>
     <!-- Simple Product Disabled -->
     <entity name="SimpleProductOffline" type="product2">
+        <data key="name" unique="suffix">SimpleOffline</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleOffline</data>
         <data key="price">123.00</data>
         <data key="status">2</data>
         <data key="quantity">100</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="SimpleProductDisabled" type="product">
+        <data key="name" unique="suffix">Simple Product Disabled</data>
         <data key="sku" unique="suffix">simple_product_disabled</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">Simple Product Disabled</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">2</data>
@@ -213,10 +213,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleProductNotVisibleIndividually" type="product">
+        <data key="name" unique="suffix">Simple Product Not Visible Individually</data>
         <data key="sku" unique="suffix">simple_product_not_visible_individually</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">Simple Product Not Visible Individually</data>
         <data key="price">123.00</data>
         <data key="visibility">1</data>
         <data key="status">1</data>
@@ -227,10 +227,10 @@
         <data key="price">321.00</data>
     </entity>
     <entity name="SimpleOne" type="product2">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleOne</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">1.23</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -238,25 +238,25 @@
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleOutOfStock" type="product2">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleOne" type="product2">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -266,26 +266,26 @@
         <data key="sku" unique="suffix">pr</data>
     </entity>
     <entity name="ApiSimpleOneHidden" type="product2">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="name" unique="suffix">Api Simple Product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">1</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleTwo" type="product2">
-        <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="name" unique="suffix">Api Simple Product Two</data>
+        <data key="sku" unique="suffix">apisimpleproducttwo</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="price">234.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -301,23 +301,23 @@
         <data key="price">70</data>
     </entity>
     <entity name="ApiSimpleTwoHidden" type="product2">
+        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">1</data>
-        <data key="name" unique="suffix">Api Simple Product Two</data>
         <data key="price">234.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="VirtualProduct" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtualproduct</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">VirtualProduct</data>
         <data key="price">99.99</data>
         <data key="quantity">250</data>
         <data key="weight">0</data>
@@ -325,10 +325,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
     </entity>
     <entity name="SimpleTwo" type="product2">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleTwo</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">1.23</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
@@ -379,52 +379,52 @@
         <data key="filename">test_image</data>
     </entity>
     <entity name="ProductWithUnicode" type="product">
+        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="sku" unique="suffix">&#38657;&#20135;&#21697;</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">&#38657;&#20135;&#21697;</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithHTMLEntityOne" type="product">
+        <data key="name" unique="suffix">SimpleOne&#8482;Product</data>
         <data key="sku" unique="suffix">SimpleOne&#8482;Product</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleOne&#8482;Product</data>
         <data key="price">50.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithHTMLEntityTwo" type="product">
+        <data key="name" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
         <data key="sku" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">SimpleTwo&#38657;&#20135;&#21697;&lt;カネボウPro</data>
         <data key="price">50.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="defaultVirtualProduct" type="product">
+        <data key="name" unique="suffix">virtualProduct</data>
         <data key="sku" unique="suffix">virtualProduct</data>
+        <data key="urlKey" unique="suffix">virtualproduct</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">virtualProduct</data>
         <data key="price">12.34</data>
-        <data key="urlKey" unique="suffix">virtualproduct</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <data key="weight">0</data>
@@ -432,13 +432,13 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithDescription" type="product">
+        <data key="name" unique="suffix">testProductWithDescriptionName</data>
         <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
+        <data key="urlKey" unique="suffix">testproductwithdescriptionurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductWithDescriptionName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testproductwithdescriptionurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -447,13 +447,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductWithDescription" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -461,13 +461,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductNameWithNoSpaces" type="product">
+        <data key="name" unique="suffix">ApiSimpleProduct</data>
         <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">ApiSimpleProduct</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -475,13 +475,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiProductWithDescriptionAndUnderscoredSku" type="product">
+        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="sku" unique="suffix">api_simple_product</data>
+        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Simple Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -489,26 +489,26 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="_newDefaultProduct" type="product">
+        <data key="name" unique="suffix">testproductname</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testproductname</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="SimpleProductWithCustomAttributeSet" type="product">
+        <data key="name" unique="suffix">testProductName</data>
         <data key="sku" unique="suffix">testSku</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="type_id">simple</data>
         <var key="attribute_set_id" entityKey="attribute_set_id" entityType="CatalogAttributeSet"/>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">testProductName</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
         <data key="status">1</data>
         <data key="weight">1</data>
         <data key="quantity">100</data>
@@ -573,13 +573,13 @@
         <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
     </entity>
     <entity name="ApiVirtualProductWithDescription" type="product">
+        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="sku" unique="suffix">api-virtual-product</data>
+        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -587,13 +587,13 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="ApiVirtualProductWithDescriptionAndUnderscoredSku" type="product">
+        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="sku" unique="suffix">api_virtual_product</data>
+        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">Api Virtual Product</data>
         <data key="price">123.00</data>
-        <data key="urlKey" unique="suffix">api-virtual-product</data>
         <data key="status">1</data>
         <data key="quantity">100</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
@@ -601,15 +601,15 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
     <entity name="SimpleProductWithNewFromDate" type="product">
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="sku" unique="suffix">SimpleProduct</data>
+        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">125.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>
         <data key="quantity">1000</data>
-        <data key="urlKey" unique="suffix">simpleproduct</data>
         <data key="weight">1</data>
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductNewsFromDate</requiredEntity>
@@ -636,7 +636,7 @@
         <var key="sku" entityKey="sku" entityType="product3"/>
     </entity>
     <entity name="ApiSimplePrice1" type="product">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
@@ -644,7 +644,7 @@
         <data key="price">1.00</data>
     </entity>
     <entity name="ApiSimplePrice100" type="product">
-        <data key="sku" unique="suffix">api-simple-product</data>
+        <data key="sku" unique="suffix">apisimpleproduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index f919bd15ac9eb..74ba1badbce85 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -27,6 +27,8 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 14fce9d4edf7c..a32b946752731 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -21,6 +21,8 @@
         <before>
             <!--Create a product-->
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
index a0f8da074536f..4be3b841c0bc7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
@@ -21,6 +21,8 @@
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
index 27d505e070f5b..18c3a1d34378b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
@@ -34,6 +34,7 @@
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
 
+        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
index a0698224b780c..24e96f3695ad3 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
@@ -34,6 +34,7 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
 
+        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index e7bf7702328c0..a350fc0acd766 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -277,6 +277,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
@@ -389,6 +390,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index 050ab3889984b..b0825b530f42b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -148,6 +148,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
@@ -270,6 +271,7 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
index 446c06ee1070c..bd480a202ac22 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -52,6 +52,8 @@
             <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
             <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
index 2d83043f81318..faea1e736a1b7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
@@ -43,8 +43,9 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete data -->

From a2e16f34fc028da456ab29409d686a7fbf2289da Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 18:44:01 +0100
Subject: [PATCH 10/17] Extend Credit Card expiration date for another 4 years

---
 .../Magento/Payment/Test/Repository/CreditCard.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
index 7e3266cadf0a3..8711f4a70346b 100644
--- a/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
+++ b/dev/tests/functional/tests/app/Magento/Payment/Test/Repository/CreditCard.xml
@@ -10,7 +10,7 @@
         <dataset name="visa_default">
             <field name="cc_number" xsi:type="string">4111111111111111</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -18,28 +18,28 @@
             <field name="cc_type" xsi:type="string">Visa</field>
             <field name="cc_number" xsi:type="string">4111111111111111</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
         <dataset name="visa_alt">
             <field name="cc_number" xsi:type="string">4012888888881881</field>
             <field name="cc_exp_month" xsi:type="string">02 - February</field>
-            <field name="cc_exp_year" xsi:type="string">2021</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
         <dataset name="amex_default">
             <field name="cc_number" xsi:type="string">378282246310005</field>
             <field name="cc_exp_month" xsi:type="string">02 - February</field>
-            <field name="cc_exp_year" xsi:type="string">2021</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">1234</field>
         </dataset>
 
         <dataset name="visa_direct">
             <field name="cc_number" xsi:type="string">4617747819866651</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
 
@@ -54,14 +54,14 @@
         <dataset name="visa_cvv_mismatch">
             <field name="cc_number" xsi:type="string">4111111111111111</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">306</field>
         </dataset>
 
         <dataset name="mastercard_default">
             <field name="cc_number" xsi:type="string">5555555555554444</field>
             <field name="cc_exp_month" xsi:type="string">01 - January</field>
-            <field name="cc_exp_year" xsi:type="string">2020</field>
+            <field name="cc_exp_year" xsi:type="string">2024</field>
             <field name="cc_cid" xsi:type="string">123</field>
         </dataset>
     </repository>

From e52bc2a701818967ea9a7bf79cc1b05513276178 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 20:33:27 +0100
Subject: [PATCH 11/17] Add indexing after creating products + changes due to
 invalid use of `sku` as URL Key :-(

---
 app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml   | 8 ++++----
 .../Mftf/Test/CartPriceRuleForConfigurableProductTest.xml | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 653a326e1c98b..a7aed3392d469 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -239,7 +239,7 @@
     </entity>
     <entity name="ApiSimpleOutOfStock" type="product2">
         <data key="name" unique="suffix">Api Simple Out Of Stock Product</data>
-        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="sku" unique="suffix">api-simple-product</data>
         <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
@@ -251,7 +251,7 @@
     </entity>
     <entity name="ApiSimpleOne" type="product2">
         <data key="name" unique="suffix">Api Simple Product</data>
-        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="sku" unique="suffix">api-simple-product</data>
         <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
@@ -267,7 +267,7 @@
     </entity>
     <entity name="ApiSimpleOneHidden" type="product2">
         <data key="name" unique="suffix">Api Simple Product</data>
-        <data key="sku" unique="suffix">apisimpleproduct</data>
+        <data key="sku" unique="suffix">api-simple-product</data>
         <data key="urlKey" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
@@ -280,7 +280,7 @@
     </entity>
     <entity name="ApiSimpleTwo" type="product2">
         <data key="name" unique="suffix">Api Simple Product Two</data>
-        <data key="sku" unique="suffix">apisimpleproducttwo</data>
+        <data key="sku" unique="suffix">api-simple-product-two</data>
         <data key="urlKey" unique="suffix">api-simple-product-two</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
index ec9246f7c33bd..baf109b4a12f1 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -74,6 +74,10 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
+
+            <wait stepKey="waitBeforeIndexer" time="60"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
@@ -118,13 +122,13 @@
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
 
         <!-- Add the first product to the cart -->
-        <amOnPage url="$$createConfigChildProduct1.sku$$.html" stepKey="goToProductPage1"/>
+        <amOnPage url="$$createConfigChildProduct1.urlKey$$.html" stepKey="goToProductPage1"/>
         <waitForPageLoad stepKey="waitForProductPageLoad1"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
         <waitForPageLoad stepKey="waitForAddToCart1"/>
         <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
         <!-- Add the second product to the cart -->
-        <amOnPage url="$$createConfigChildProduct2.sku$$.html" stepKey="goToProductPage2"/>
+        <amOnPage url="$$createConfigChildProduct2.urlKey$$.html" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="waitForProductPageLoad2"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
         <waitForPageLoad stepKey="waitForAddToCart2"/>

From 548da895caa3393ce951ce0675fea398c5a1910b Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 1 Feb 2020 20:46:45 +0100
Subject: [PATCH 12/17] urlKey is not used

---
 .../Mftf/Test/CartPriceRuleForConfigurableProductTest.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
index baf109b4a12f1..d44e89aef8e25 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -122,13 +122,13 @@
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
 
         <!-- Add the first product to the cart -->
-        <amOnPage url="$$createConfigChildProduct1.urlKey$$.html" stepKey="goToProductPage1"/>
+        <amOnPage url="$$createConfigChildProduct1.sku$$.html" stepKey="goToProductPage1"/>
         <waitForPageLoad stepKey="waitForProductPageLoad1"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
         <waitForPageLoad stepKey="waitForAddToCart1"/>
         <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
         <!-- Add the second product to the cart -->
-        <amOnPage url="$$createConfigChildProduct2.urlKey$$.html" stepKey="goToProductPage2"/>
+        <amOnPage url="$$createConfigChildProduct2.sku$$.html" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="waitForProductPageLoad2"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
         <waitForPageLoad stepKey="waitForAddToCart2"/>

From ea4a31ee10de19ab2d1cddb164eac62504e2fd1c Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 2 Feb 2020 11:12:42 +0100
Subject: [PATCH 13/17] Trying to avoid waitForIndex

---
 .../Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml      | 1 -
 .../Test/StorefrontCheckBundleProductOptionTierPrices.xml     | 1 -
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml  | 1 -
 .../Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml | 1 -
 .../Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml  | 1 -
 .../Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml   | 1 -
 .../Test/Mftf/Data/ConfigurableProductData.xml                | 4 ++--
 .../Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml | 1 -
 .../Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml | 1 -
 .../Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml | 1 -
 .../Mftf/Test/CartPriceRuleForConfigurableProductTest.xml     | 1 -
 .../Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml | 2 --
 .../Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml     | 2 --
 ...MoveDynamicBundleProductFromShoppingCartToWishlistTest.xml | 1 -
 ...ntMoveFixedBundleProductFromShoppingCartToWishlistTest.xml | 1 -
 15 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 8a7e3b8344f86..fbb9dda50f0d9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -70,7 +70,6 @@
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
         <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
 
-        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
index 8e482ea8f1551..6c6cc9185380b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
@@ -44,7 +44,6 @@
             </actionGroup>
             <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index 68b2eda76c569..613187a4c3856 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -23,7 +23,6 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 8a9a01809f015..3a40a1b7eeb71 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -65,7 +65,6 @@
         <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
         <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
-        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!-- Go to the storefront bundled product page -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 74ba1badbce85..84eb3a843aa1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -28,7 +28,6 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
             <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index a32b946752731..e335caa2ddb64 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -22,7 +22,6 @@
             <!--Create a product-->
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index 3edb7c0f17ab9..87b181616bd7a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -23,12 +23,12 @@
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="ApiConfigurableProduct" type="product">
+        <data key="name" unique="suffix">API Configurable Product</data>
         <data key="sku" unique="suffix">api-configurable-product</data>
+        <data key="urlKey" unique="suffix">api-configurable-product</data>
         <data key="type_id">configurable</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
-        <data key="name" unique="suffix">API Configurable Product</data>
-        <data key="urlKey" unique="suffix">api-configurable-product</data>
         <data key="price">123.00</data>
         <data key="weight">2</data>
         <data key="status">1</data>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
index 4be3b841c0bc7..924707a16600f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableSetEditRelatedProductsTest.xml
@@ -22,7 +22,6 @@
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
index 18c3a1d34378b..27d505e070f5b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDownloadableSetEditRelatedProductsTest.xml
@@ -34,7 +34,6 @@
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
 
-        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
index 24e96f3695ad3..a0698224b780c 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedSetEditRelatedProductsTest.xml
@@ -34,7 +34,6 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
 
-        <wait stepKey="waitBeforeIndexer" time="60"/>
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
index d44e89aef8e25..9dbcc72cf5575 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -75,7 +75,6 @@
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index a350fc0acd766..e7bf7702328c0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -277,7 +277,6 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
@@ -390,7 +389,6 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index b0825b530f42b..050ab3889984b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -148,7 +148,6 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
@@ -271,7 +270,6 @@
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
         </before>
         <after>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
index bd480a202ac22..9fffa51e7d3c7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -53,7 +53,6 @@
             <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
index faea1e736a1b7..f942a8f314a67 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
@@ -44,7 +44,6 @@
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
 
-            <wait stepKey="waitBeforeIndexer" time="60"/>
             <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>

From b130bd0670b2190903f358ca036005020407cefb Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 2 Feb 2020 13:23:22 +0100
Subject: [PATCH 14/17] Fix invalid URL for order_shipment page

---
 .../Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
index 597abb5694e30..4ccda7ae7f2b1 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.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="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
+    <page name="AdminShipmentNewPage" url="admin/order_shipment/new/order_id/" area="admin" module="Shipping">
         <section name="AdminShipmentMainActionsSection"/>
         <section name="AdminShipmentOrderInformationSection"/>
         <section name="AdminShipmentAddressInformationSection"/>
@@ -16,4 +16,4 @@
         <section name="AdminShipmentItemsSection"/>
         <section name="AdminShipmentTotalSection"/>
     </page>
-</pages>
\ No newline at end of file
+</pages>

From fc6fd6274bbc522cde5fd577556ae98f04de3d98 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 2 Feb 2020 15:19:23 +0100
Subject: [PATCH 15/17] Extend the time wait for success notification

---
 .../ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
index a69cd8688c6c5..c4e70a1cacd1c 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreateInvoiceAndCreditMemoActionGroup.xml
@@ -13,7 +13,7 @@
         <waitForPageLoad stepKey="waitForLoadingCreditMemoPage" after="pushButtonCreditMemo"/>
         <scrollTo selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="scrollToBottom" after="waitForLoadingCreditMemoPage"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmitRefund" after="scrollToBottom"/>
-        <waitForPageLoad stepKey="waitForMainOrderPageLoad" after="clickSubmitRefund"/>
+        <waitForPageLoad stepKey="waitForMainOrderPageLoad" after="clickSubmitRefund" time="60"/>
         <see userInput="You created the credit memo." stepKey="seeCreditMemoMessage" after="waitForMainOrderPageLoad"/>
     </actionGroup>
 </actionGroups>

From ed51b40914b99562ed9125c225694b3bd48af418 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 3 Feb 2020 13:03:06 +0100
Subject: [PATCH 16/17] Use Order Entity ID instead of Order Increment ID

---
 .../Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
index 45fdfebfa8145..ecdf9e34de55a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminOrderDetailsMainActionsSection">
         <element name="back" type="button" selector="#back" timeout="30"/>
         <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
+        <element name="orderEntityId" type="input" selector="#sales_order_view input[name='order_id']" timeout="30"/>
         <element name="sendEmail" type="button" selector="#send_notification" timeout="30"/>
         <element name="creditMemo" type="button" selector="#order_creditmemo" timeout="30"/>
         <element name="hold" type="button" selector="#order-view-hold-button" timeout="30"/>

From 3eb92f5e8346a9fdbc22ed8a87a404130858d16b Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 10 Feb 2020 14:27:35 +0100
Subject: [PATCH 17/17] Reindex after saving product changes

---
 .../AdminCreateDownloadableProductWithCustomOptionsTest.xml     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
index fb5983bb58b6d..3651b322628c4 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
@@ -88,6 +88,8 @@
         <!-- Save product -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
+        <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
+
         <!-- Go to storefront category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>