B2B-2117: Prepare AWS Aurora Functional Test CI Build for Handing Off to GL Team

dhaecker · dhaecker · commit 0ee55ffda3da · 2022-02-25T13:06:57.000-06:00
- Fixing flaky tests
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml
@@ -33,7 +33,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
                 <argument name="sku" value="{{_defaultProduct.sku}}"/>
             </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
             <closeTab stepKey="closeTab"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml
@@ -33,7 +33,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
                 <argument name="sku" value="{{_defaultProduct.sku}}"/>
             </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml
@@ -42,7 +42,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
                 <argument name="sku" value="{{_defaultProduct.sku}}"/>
             </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="createPageBuilderAttribute" stepKey="deleteAttribute1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml
@@ -45,7 +45,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
                 <argument name="sku" value="{{SimpleProduct.sku}}"/>
             </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!-- Create product and assign to store view -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
@@ -46,7 +46,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct1">
                 <argument name="sku" value="Updated-SKU"/>
             </actionGroup>
-            <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml
@@ -29,6 +29,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
                 <argument name="sku" value="{{BaseConfigurableProduct.sku}}"/>
             </actionGroup>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
                 <argument name="productAttributeLabel" value="{{visualSwatchAttribute.default_label}}"/>
             </actionGroup>
