merge magento/2.3-develop into magento-tsg/2.3-develop-pr90

Author: magento-mts-svc

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml

@@ -17,6 +17,7 @@
             <argument name="submenuUiId" type="string"/>
         </arguments>
 
+        <waitForPageLoad stepKey="waitPageLoad"/>
         <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
         <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
     </actionGroup>

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml

@@ -25,6 +25,7 @@
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
             <argument name="title" value="{{AdminMenuDashboard.pageTitle}}"/>

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

@@ -16,7 +16,7 @@
             <argument name="productAttributeCode" type="string"/>
         </arguments>
 
-        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="waitForAdminProductAttributeGridLoad"/>
+        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" before="seeAttributeCodeInGrid" stepKey="waitForAdminProductAttributeGridLoad"/>
         <click selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="clickAttributeToView"/>
         <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad"/>
     </actionGroup>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml

@@ -51,6 +51,9 @@
         <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <after>
+            <actionGroup ref="DeleteCategory" stepKey="DeleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml

@@ -19,8 +19,6 @@
             <group value="ConfigurableProduct"/>
         </annotations>
         <before>
-            <!-- Login as Admin -->
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!-- Create default category with subcategory -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <createData entity="SubCategoryWithParent" stepKey="createSubcategory">
@@ -70,6 +68,8 @@
             <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption8">
                 <requiredEntity createDataKey="createConfigProductAttribute2"/>
             </createData>
+            <!-- Login as Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!-- Add created attributes with options to Attribute Set -->
             <actionGroup ref="AdminAddUnassignedAttributeToGroup" stepKey="createDefaultAttributeSet">
                 <argument name="label" value="mySet"/>
@@ -89,33 +89,34 @@
             <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
                 <argument name="label" value="mySet"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearAttributeSetsFilter"/>
             <!-- Delete First attribute -->
-            <actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchAttributeByCodeOnProductAttributeGrid">
-                <argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-            </actionGroup>
             <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
                 <argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
             </actionGroup>
             <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
                 <argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
             </actionGroup>
             <!-- Delete Second attribute -->
-            <actionGroup ref="SearchAttributeByCodeOnProductAttributeGridActionGroup" stepKey="searchSecondAttributeByCodeOnProductAttributeGrid">
-                <argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
-            </actionGroup>
             <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openSecondProductAttributeFromSearchResultInGrid">
                 <argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
             </actionGroup>
             <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteSecondProductAttributeByAttributeCode">
                 <argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
             </actionGroup>
+            <!-- Clear filters -->
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductAttributesFilter"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilter"/>
             <!-- Log out -->
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Create three configurable products with options -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
         <waitForPageLoad time="30" stepKey="wait1"/>
         <!-- Edit created first product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridByFirstProduct">
+            <argument name="product" value="$$createFirstConfigurableProduct$$"/>
+        </actionGroup>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductFirst">
             <argument name="product" value="$$createFirstConfigurableProduct$$"/>
         </actionGroup>
@@ -135,6 +136,9 @@
         <waitForPageLoad stepKey="waitForMessage"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageFirst"/>
         <!-- Edit created second product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridBySecondProduct">
+            <argument name="product" value="$$createSecondConfigurableProduct$$"/>
+        </actionGroup>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductSecond">
             <argument name="product" value="$$createSecondConfigurableProduct$$"/>
         </actionGroup>
@@ -155,6 +159,9 @@
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageSecond"/>
         <!-- Edit created third product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridByThirdProduct">
+            <argument name="product" value="$$createThirdConfigurableProduct$$"/>
+        </actionGroup>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductThird">
             <argument name="product" value="$$createThirdConfigurableProduct$$"/>
         </actionGroup>
@@ -174,6 +181,9 @@
         <waitForPageLoad stepKey="waitForProductPage"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveConfigurableProductMessage"/>
         <!-- Create Simple product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridBySimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditSimpleProduct">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>

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

@@ -20,7 +20,7 @@
              <group value="SearchEngineMysql"/>
          </annotations>
          <before>
-             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+             <magentoCLI command="downloadable:domains:add example.com static.magento.com" before="product" stepKey="addDownloadableDomain"/>
              <createData entity="ApiDownloadableProduct" stepKey="product"/>
              <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                  <requiredEntity createDataKey="product"/>
@@ -30,7 +30,7 @@
              </createData>
          </before>
          <after>
-             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+             <magentoCLI command="downloadable:domains:remove example.com static.magento.com" stepKey="removeDownloadableDomain"/>
          </after>
      </test>
  </tests>