Merge remote-tracking branch 'origin/2.3-develop' into MC-19250

Author: BaDos

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

@@ -400,5 +400,6 @@
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml

@@ -116,6 +116,7 @@
             <deleteData createDataKey="createSimpleCategory1" stepKey="deleteSimpleCategory1"/>
             <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
             <deleteData createDataKey="createConfigProduct1" stepKey="deleteConfigProduct1"/>
             <deleteData createDataKey="createVirtualProduct1" stepKey="deleteVirtualProduct1"/>
             <deleteData createDataKey="createBundleProduct1" stepKey="deleteBundleProduct1"/>

app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml

@@ -22,6 +22,9 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="DownloadableProduct"/>
+            </actionGroup>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
         </after>
 

app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml

@@ -18,7 +18,7 @@
 
         <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
         <click selector="{{AdminDataGridPaginationSection.perPageOption(perPage)}}" stepKey="selectCustomPerPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 
     <actionGroup name="adminDataGridSelectCustomPerPage">