Merge pull request #218 from magento-cia/2.4.5-develop-2.4-develop-sy…

…nc-041922 Sync of 2.4.5-develop with 2.4-develop
magento · May 16, 2022 · 9c55e3f · 9c55e3f
2 parents cacd5d3 + 4391efc
commit 9c55e3f
Show file tree

Hide file tree

Showing 560 changed files with 5,392 additions and 1,946 deletions.
diff --git a/...Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml b/...Test/Mftf/Test/AdminAddConfigurableProductWithTextSwatchAttributeAndDefaultSourceTest.xml
@@ -28,6 +28,9 @@
                 <requiredEntity createDataKey="createStock1"/>
                 <requiredEntity createDataKey="createSource1"/>
             </createData>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
@@ -147,5 +150,6 @@
         <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteConfigurableProduct">
             <argument name="product" value="ConfigurableMsiProduct"/>
         </actionGroup>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
     </test>
 </tests>
diff --git a/Inventory/Test/Mftf/Test/AdminCreateVirtualProductWithDefaultSourceTest.xml b/Inventory/Test/Mftf/Test/AdminCreateVirtualProductWithDefaultSourceTest.xml
@@ -37,6 +37,7 @@
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+            <magentoCron groups="index" stepKey="reindex"/>
         </after>
 
         <!--Verify product on category page.-->

diff --git a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnSimpleProductTest.xml
@@ -82,6 +82,7 @@
 
         <fillField selector="#qty" userInput="1.25" stepKey="fillQtyField1"/>
 
+        <waitForElementClickable selector="{{StorefrontProductActionSection.addToCart}}" stepKey="waitForAddToCartButton"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCart1"/>
         <waitForPageLoad stepKey="waitForPageLoad9"/>
         <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
@@ -103,7 +104,7 @@
         <click selector=".action.continue" stepKey="clickOnUpdate1"/>
         <waitForPageLoad stepKey="waitForPageLoad19"/>
 
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder1"/>
         <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="seeOrderNumber1"/>
     </test>
 </tests>
diff --git a/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml b/Inventory/Test/Mftf/Test/AdminUseDecimalQuantityOnVirtualProductTest.xml
@@ -82,6 +82,7 @@
 
         <fillField selector="#qty" userInput="1.25" stepKey="fillQtyField1"/>
 
+        <waitForElementClickable selector="{{StorefrontProductActionSection.addToCart}}" stepKey="waitForAddToCartButton"/>
         <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCart1"/>
         <waitForPageLoad stepKey="waitForPageLoad9"/>
         <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
@@ -111,8 +112,8 @@
         <click selector="{{CheckoutPaymentSection.update}}" stepKey="updateCustomerBillingAddress"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
 
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
-        <waitForPageLoad stepKey="waitForPageLoad21"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder1"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad21"/>
         <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="seeOrderNumber1"/>
     </test>
 </tests>
diff --git a/Inventory/composer.json b/Inventory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory",
     "description": "N/A",
     "require": {
-        "php": "~7.4.0||~8.0.0||~8.1.0",
+        "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*"
     },

diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/DisableAllSourcesActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/DisableAllSourcesActionGroup.xml
@@ -11,7 +11,7 @@
         <amOnPage url="{{AdminManageSourcePage.url}}" stepKey="amOnTheManageSourcePage"/>
         <waitForPageLoad time="30" stepKey="waitForAdminManageSourcePageLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitFilterCleared"/>
+        <waitForPageLoad stepKey="waitFilterCleared"/>
         <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllSources"/>
         <click selector="{{AdminManageSourcesGridMassAction.actionsButton}}" stepKey="clickActionsButton"/>

diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/DisableSourceActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/DisableSourceActionGroup.xml
@@ -22,7 +22,7 @@
         <click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters"/>
         <fillField userInput="{{sourceCode}}" selector="{{AdminManageSourcesGridFilterControls.code}}" stepKey="fillCodeField"/>
         <click selector="{{AdminGridFilterControls.applyFilters}}" stepKey="clickOnApplyFilters"/>
-        <waitForLoadingMaskToDisappear stepKey="waitFiltersApplied"/>
+        <waitForPageLoad stepKey="waitFiltersApplied"/>
         <click selector="{{AdminGridRow.editByValue(sourceCode)}}"
                stepKey="clickEditCustomSource"/>
         <waitForPageLoad time="30" stepKey="waitForCustomSourceEditPageLoad"/>

diff --git a/...t/Mftf/ActionGroup/StorefrontAddConfigurableProductWithTextSwatchToTheCartActionGroup.xml b/...t/Mftf/ActionGroup/StorefrontAddConfigurableProductWithTextSwatchToTheCartActionGroup.xml
@@ -12,7 +12,9 @@
         <annotations>
             <description>Goes to the provided Storefront URL. Selects the provided Product Option under the Product Attribute. Fills in the provided Quantity. Clicks Add to Cart. Validates that the Success Message is present.</description>
         </annotations>
-        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(productOption)}}" stepKey="clickSwatchOption" after="waitForProductFrontPageToLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(productOption)}}" stepKey="waitForSwatchOption" after="waitForProductFrontPageToLoad"/>
+        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(productOption)}}" stepKey="clickSwatchOption" after="waitForSwatchOption"/>
+        <comment userInput="BIC workaround" stepKey="waitForOptions"/>
         <remove keyForRemoval="selectOption1"/>
     </actionGroup>
 </actionGroups>
diff --git a/InventoryAdminUi/Test/Mftf/Data/CatalogInventoryConfigData.xml b/InventoryAdminUi/Test/Mftf/Data/CatalogInventoryConfigData.xml
@@ -13,6 +13,11 @@
         <data key="scope_id">0</data>
         <data key="value">1</data>
     </entity>
+    <entity name="TurnOffOutOfStockConfig">
+        <data key="path">cataloginventory/options/show_out_of_stock</data>
+        <data key="scope_id">0</data>
+        <data key="value">0</data>
+    </entity>
     <entity name="TurnOnManageStockConfig">
         <data key="path">cataloginventory/item_options/manage_stock</data>
         <data key="scope_id">0</data>
@@ -33,11 +38,6 @@
         <data key="scope_id">0</data>
         <data key="value">0</data>
     </entity>
-    <entity name="TurnOffOutOfStockConfig">
-        <data key="path">cataloginventory/options/show_out_of_stock</data>
-        <data key="scope_id">0</data>
-        <data key="value">0</data>
-    </entity>
     <entity name="SetOnlyXLeftThreshold">
         <data key="path">cataloginventory/options/stock_threshold_qty </data>
         <data key="scope_id">0</data>

diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventoryB2bMultiModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventoryB2bMultiModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventoryB2bMultiModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="msi_b2b"/>
@@ -20,7 +24,12 @@
             <group name="single_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventoryB2bSingleModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventoryB2bSingleModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventoryB2bSingleModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="msi_b2b"/>
@@ -20,7 +24,12 @@
             <group name="multi_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventoryEeMultiModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventoryEeMultiModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventoryEeMultiModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="msi_ee"/>
@@ -20,7 +24,12 @@
             <group name="single_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventoryEeSingleModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventoryEeSingleModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventoryEeSingleModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="msi_ee"/>
@@ -20,7 +24,12 @@
             <group name="multi_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventoryMultiModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventoryMultiModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventoryMultiModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="multi_mode"/>
@@ -20,7 +24,12 @@
             <group name="single_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventorySingleModeSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventorySingleModeSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventorySingleModeSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="single_mode"/>
@@ -20,7 +24,12 @@
             <group name="multi_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/InventoryAdminUi/Test/Mftf/Suite/InventorySortOrderSuite.xml b/InventoryAdminUi/Test/Mftf/Suite/InventorySortOrderSuite.xml
@@ -9,8 +9,12 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="InventorySortOrderSuite">
         <before>
-            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG" />
-            <magentoCLI stepKey="enableStockManagement" command="config:set cataloginventory/item_options/manage_stock 1"/>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <include>
             <group name="sort_order_test"/>
@@ -21,7 +25,12 @@
             <group name="multi_mode"/>
         </exclude>
         <after>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSYWYG"/>
+            <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableStockManagement"/>
+            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
     </suite>
 </suites>
diff --git a/...nUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml b/...nUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml
@@ -80,6 +80,9 @@
             <actionGroup ref="DisableSourceActionGroup" stepKey="disableSource">
                 <argument name="sourceCode" value="$source.source[source_code]$"/>
             </actionGroup>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
         </after>
 
@@ -95,7 +98,7 @@
         </actionGroup>
         <!--Place order.-->
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
         <actionGroup ref="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup" stepKey="clickOrderLink"/>
         <comment userInput="BIC workaround" stepKey="orderNumber"/>

diff --git a/...nUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderDownloadableProductCustomStockTest.xml b/...nUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderDownloadableProductCustomStockTest.xml
@@ -50,6 +50,7 @@
                 <argument name="sourceCode" value="$source.source[source_code]$"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
+            <magentoCron groups="index" stepKey="reindex"/>
         </after>
 
         <!-- Login as customer -->