Merge branch '2.4-develop' into performance-inline-translations

magento · May 26, 2020 · 52cb062 · 52cb062
2 parents d3c9a49 + 8d90d12
commit 52cb062
Show file tree

Hide file tree

Showing 80 changed files with 1,008 additions and 130 deletions.
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml
@@ -10,7 +10,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFilterLegacyGridActionGroup">
         <arguments>
-            <argument name="fieldSelector" type="string"/>
             <argument name="value" type="string"/>
             <argument name="button" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.apply}}"/>
         </arguments>

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml
@@ -15,6 +15,7 @@
             <title value="Admin should be able to manage persistent shopping cart settings"/>
             <description value="Admin should be able to enable persistent shopping cart in Magento Admin backend and see additional options"/>
             <group value="backend"/>
+            <severity value="MAJOR"/>
         </annotations>
 
         <before>

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminOrderBundleProductActionGroup.xml
@@ -10,7 +10,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOrderConfigureBundleProduct">
         <arguments>
-            <argument name="productName" type="string" defaultValue="{{SimpleProduct.sku}}"/>
             <argument name="productNumber" type="string" defaultValue="1"/>
             <argument name="productQty" type="string" defaultValue="1"/>
         </arguments>

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/ViewBundleProductInAdminGridActionGroup.xml
@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="product" defaultValue="BundleProduct"/>
-            <argument name="thumbnail" defaultValue="ProductPlaceholderImage"/>
         </arguments>
 
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>

diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml b/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml
@@ -10,6 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="UpdateBundleProductViaImportTest">
         <annotations>
+            <stories value="Update Bundle product via import"/>
             <features value="Import/Export"/>
             <title value="Update Bundle product via import"/>
             <description

diff --git a/...f/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml b/...f/ActionGroup/AdminCreateAttributeWithValueWithTwoStoreViesFromProductPageActionGroup.xml
@@ -15,7 +15,6 @@
         </annotations>
         <arguments>
             <argument name="firstStoreViewName" type="string"/>
-            <argument name="secondStoreViewName" type="string"/>
         </arguments>
 
         <click selector="{{AdminProductFormNewAttributeSection.addValue}}" stepKey="addValue" after="selectAttributeType"/>

diff --git a/...alog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml b/...alog/Test/Mftf/ActionGroup/AdminCreateSimpleProductWithTextOptionCharLimitActionGroup.xml
@@ -15,7 +15,6 @@
         <arguments>
             <argument name="category"/>
             <argument name="simpleProduct"/>
-            <argument name="charLimit"/>
         </arguments>
 
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>

diff --git a/.../Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml b/.../Magento/Catalog/Test/Mftf/ActionGroup/AdminSwitchScopeForProductAttributeActionGroup.xml
@@ -9,9 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSwitchScopeForProductAttributeActionGroup">
-        <arguments>
-            <argument name="scope" type="string" defaultValue="1"/>
-        </arguments>
         <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
         <waitForElementVisible selector="{{AttributePropertiesSection.Scope}}" stepKey="waitOpenAdvancedProperties"/>
         <selectOption selector="{{AttributePropertiesSection.Scope}}" userInput="1" stepKey="selectNecessaryScope"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckCategoryImageInAdminActionGroup.xml
@@ -12,9 +12,6 @@
         <annotations>
             <description>Requires navigation to the Category creation/edit page. Click on the Upload button. Validates that the Image exists.</description>
         </annotations>
-        <arguments>
-            <argument name="image" defaultValue="ProductImage"/>
-        </arguments>
 
         <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="itemType"/>
-            <argument name="itemName"/>
         </arguments>
 
         <conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle('itemType')}}" dependentSelector="{{StorefrontCategorySidebarSection.filterOptions}}" visible="false" stepKey="expandFilterOptions"/>

diff --git a/...agento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml b/...agento/Catalog/Test/Mftf/ActionGroup/DeleteProductAttributeByAttributeCodeActionGroup.xml
@@ -12,9 +12,6 @@
         <annotations>
             <description>Delete a Product Attribute from the Product Attribute creation/edit page.</description>
         </annotations>
-        <arguments>
-            <argument name="productAttributeCode" type="string"/>
-        </arguments>
 
         <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad" time="30"/>
         <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/TestDynamicValidationHintActionGroup.xml
@@ -12,9 +12,6 @@
         <annotations>
             <description>Validates that the Product Text Option Text Length Hint displays the correct Count for multiple inputs based on the provided Character Limit.</description>
         </annotations>
-        <arguments>
-            <argument name="charLimit"/>
-        </arguments>
 
         <fillField userInput="abcde" selector="{{StorefrontProductPageSection.customTextOptionInput}}" stepKey="textInput1"/>
         <see selector="{{StorefrontProductPageSection.charCounter}}" userInput="(15 remaining)" stepKey="assertHint1"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckMediaRolesForFirstAddedImageViaApiTest.xml
@@ -15,6 +15,7 @@
             <description value="Login as admin, create simple product, add image to created product (via API).Go to
                 Admin Product Edit page for created product to check that added image has selected image roles."/>
             <group value="catalog"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml
@@ -16,6 +16,7 @@
                 Check category level for child category entity based on parent level.
                 Check category tree: parent element has child element. "/>
             <group value="catalog"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckProductListPriceAttributesTest.xml
@@ -15,6 +15,7 @@
             <description value="Login as admin, create simple product, add cost, special price. Go to Admin
                 Product List page filter grid by created product, add mentioned columns to grid, check values."/>
             <group value="catalog"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>

diff --git a/...nto/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml b/...nto/Catalog/Test/Mftf/Test/StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest.xml
@@ -10,6 +10,7 @@
     <test name="StoreFrontSimpleProductWithSpecialAndTierDiscountPriceTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Apply discount tier price and custom price values for simple product"/>
             <title value="Apply discount tier price and custom price values for simple product"/>
             <description value="Apply discount tier price and custom price values for simple product"/>
             <severity value="MAJOR"/>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontConfigurableOptionsThumbImagesTest.xml
@@ -16,6 +16,7 @@
                 associated simple products. Add few images for products, check the fotorama thumbnail images
                 (visible and active) for each selected option for the configurable product"/>
             <group value="catalog"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <!-- Login as Admin -->

diff --git a/...alog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml b/...alog/Test/Mftf/Test/StorefrontSelectedByQueryParamsConfigurableOptionsThumbImagesTest.xml
@@ -18,6 +18,7 @@
                 associated simple products. Add few images for products, check the fotorama thumbnail images
                 (visible and active) for each option for the configurable product using product URL with params
                 to selected needed option."/>
+            <severity value="MAJOR"/>
             <group value="catalog"/>
         </annotations>
 

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -105,6 +105,8 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
+        <magentoCron stepKey="runCronIndex" groups="index"/>
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->

diff --git a/...to/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/...to/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -50,6 +50,10 @@
 
         <magentoCron stepKey="runCronIndex" groups="index"/>
 
+        <wait stepKey="waitForReindexing" time="60" />
+        <reloadPage stepKey="pageReload" />
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->

diff --git a/...CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml b/...CatalogRule/Test/Mftf/ActionGroup/AdminCreateCatalogPriceRuleWithConditionActionGroup.xml
@@ -9,9 +9,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateCatalogPriceRuleWithConditionActionGroup" extends="CreateCatalogPriceRuleActionGroup">
-        <arguments>
-            <argument name="catalogRuleType" type="entity" defaultValue="PriceRuleWithCondition"/>
-        </arguments>
         <waitForPageLoad stepKey="waitForPageLoad" after="addNewRule"/>
         <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="expandConditions" before="openActionDropdown"/>
         <scrollTo selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="scrollToConditionsTab" after="expandConditions"/>

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="catalogRule" defaultValue="inactiveCatalogRule" />
-            <argument name="status"  type="string" defaultValue=""/>
             <argument name="websites" type="string"/>
             <argument name="customerGroup" type="string"/>
         </arguments>

diff --git a/...ento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/...ento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
@@ -11,8 +11,8 @@
         <annotations>
             <features value="CatalogRule"/>
             <stories value="Apply catalog price rule"/>
-            <title value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
-            <description value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
+            <title value="Admin should be able to apply the catalog price rule for simple product with 3 custom options"/>
+            <description value="Admin should be able to apply the catalog price rule for simple product with 3 custom options"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14769"/>
             <group value="CatalogRule"/>

diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml
@@ -8,8 +8,10 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRewriteProductWithTwoStoreTest">
         <annotations>
+            <stories value="Rewriting URL of product"/>
             <title value="Rewriting URL of product"/>
             <description value="Rewriting URL of product. Verify the full URL address"/>
+            <severity value="MAJOR"/>
             <group value="CatalogUrlRewrite"/>
         </annotations>
 

diff --git a/...e/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml b/...e/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutCartItemsActionGroup.xml
@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="productName" type="string"/>
-            <argument name="productSku" type="string"/>
             <argument name="productPrice" type="string"/>
             <argument name="subtotal" type="string"/>
             <argument name="qty" type="string"/>

diff --git a/...ckout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml b/...ckout/Test/Mftf/ActionGroup/StorefrontAssertProductAddToCartSuccessMessageActionGroup.xml
@@ -8,9 +8,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontAssertProductAddToCartSuccessMessageActionGroup">
-        <arguments>
-            <argument name="message" type="string" defaultValue=""/>
-        </arguments>
         <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForProductAddedMessage"/>
         <see selector="{{StorefrontMessagesSection.success}}" userInput="message" stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml
@@ -13,7 +13,6 @@
             <argument name="attributeSelector2" type="string" defaultValue="show_buttons"/>
             <argument name="productAttributeSection1" type="string"  defaultValue="1"/>
             <argument name="productAttributeSection2" type="string" defaultValue="4" />
-            <argument name="buttonToShowSection1" type="string"  defaultValue="1"/>
             <argument name="buttonToShowSection2" type="string" defaultValue="3" />
         </arguments>
 

diff --git a/...nto/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml b/...nto/Cms/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml
@@ -16,6 +16,7 @@
                 to add image to new folder (using enter key) for WYSIWYG content of Block"/>
             <description value="Admin should be able to cancel and close 'create folder' modal window using ESC key and
                 to add image to new folder (using enter key) for WYSIWYG content of Block"/>
+            <severity value="MAJOR"/>
         </annotations>
 
         <before>

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateAndDisableTest.xml
@@ -11,9 +11,11 @@
     <test name="AdminCmsPageUpdateAndDisableTest">
         <annotations>
             <features value="Cms"/>
+            <stories value="Update CMS Page via the Admin, disable"/>
             <testCaseId value="MC-14673" />
             <title value="Update CMS Page via the Admin, disable"/>
             <description value="Admin should be able to update a CMS Page"/>
+            <severity value="CRITICAL"/>
             <group value="backend"/>
             <group value="cMSContent"/>
             <group value="mtf_migrated"/>

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml
@@ -11,9 +11,11 @@
     <test name="AdminCmsPageUpdateTest">
         <annotations>
             <features value="Cms"/>
+            <stories value="Update CMS Page via the Admin"/>
             <title value="Update CMS Page via the Admin"/>
             <description value="Admin should be able to update a CMS Page"/>
             <testCaseId value="MC-14674"/>
+            <severity value="CRITICAL"/>
             <group value="backend"/>
             <group value="cMSContent"/>
             <group value="mtf_migrated"/>

diff --git a/...e/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml b/...e/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml
@@ -14,6 +14,7 @@
             <testCaseId value="MC-14657" />
             <stories value="Create a CMS block via the Admin, disable, add to category, verify on frontend"/>
             <title value="Create disabled CMS block entity and assign to category"/>
+            <description value="Create disabled CMS block entity and assign to category"/>
             <severity value="MAJOR"/>
             <group value="cMSContent"/>
             <group value="mtf_migrated"/>

diff --git a/...de/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml b/...de/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml
@@ -13,6 +13,7 @@
             <features value="Cms"/>
             <stories value="Create a CMS block via the Admin, add to category, verify on frontend"/>
             <title value="Create CMS block entity and assign to category"/>
+            <description value="Create CMS block entity and assign to category"/>
             <testCaseId value="MC-14658"/>
             <severity value="MAJOR"/>
             <group value="cMSContent"/>

diff --git a/...eProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml b/...eProduct/Test/Mftf/ActionGroup/AssertConfigurableProductOnAdminProductPageActionGroup.xml
@@ -12,9 +12,6 @@
         <annotations>
             <description>Validates that the provided Configurable Product Name, SKU and Price are present and correct on the Configurable Product creation/edit page. PLEASE NOTE: The Product Data is Hardcoded.</description>
         </annotations>
-        <arguments>
-            <argument name="product" type="entity"/>
-        </arguments>
 
         <seeInField userInput="{{ApiConfigurableProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="seeNameRequired"/>
         <seeInField userInput="{{ApiConfigurableProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeSkuRequired"/>

diff --git a/...tionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml b/...tionGroup/AssertConfigurableProductWithSpecialPriceOnStorefrontProductPageActionGroup.xml
@@ -15,7 +15,6 @@
         <arguments>
             <argument name="option" type="string"/>
             <argument name="price" type="string"/>
-            <argument name="specialPrice" defaultValue="specialProductPrice"/>
         </arguments>
 
         <selectOption userInput="{{option}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOptionWithSpecialPrice"/>

diff --git a/...bleProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml b/...bleProduct/Test/Mftf/ActionGroup/CreateConfigurableProductWithAttributeSetActionGroup.xml
@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="product" defaultValue="_defaultProduct"/>
-            <argument name="category" defaultValue="_defaultCategory"/>
             <argument name="label" type="string" defaultValue="mySet"/>
             <argument name="option" type="string" defaultValue="['option1', 'option2', 'option3', 'option4']"/>
         </arguments>

diff --git a/...agento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/...agento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
@@ -200,8 +200,6 @@
         <click selector="{{AdminGridMainControls.save}}" stepKey="clickToSaveProduct"/>
         <waitForPageLoad stepKey="waitForNewSimpleProductPage"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageThird"/>
-         <!--TODO: REMOVE AFTER FIX MC-21717 -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
+        <magentoCron stepKey="runCronIndex" groups="index"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml b/app/code/Magento/Cookie/Test/Mftf/Test/AdminValidateCookieLifetimeTest.xml
@@ -14,6 +14,7 @@
             <stories value="Validate cookie lifetime field in Magento admin"/>
             <title value="Admin should not able to enter text in cookie lifetime filed"/>
             <description value="Admin can only be able type numbers in cookie lifetime filed in Magento admin"/>
+            <severity value="MAJOR"/>
             <group value="Cookie"/>
         </annotations>
         <before>

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeAllCustomersGroupViaGridTest.xml
@@ -10,9 +10,11 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminChangeAllCustomersGroupViaGridTest" extends="AdminChangeSingleCustomerGroupViaGridTest">
         <annotations>
+            <stories value="Change all customers' group via grid"/>
             <title value="Change all customers' group via grid"/>
             <description value="Select All customers to change their group"/>
             <testCaseId value="MC-26040"/>
+            <severity value="MAJOR"/>
         </annotations>
 
         <remove keyForRemoval="filterCustomer"/>

diff --git a/...agento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml b/...agento/Customer/Test/Mftf/Test/AdminCheckDateOfBirthValidationForFranceDateFormatTest.xml
@@ -12,6 +12,8 @@
             <features value="Customer"/>
             <stories value="Checks 'Date of Birth' field validation for the France date format value"/>
             <title value="Checks 'Date of Birth' field validation for the France date format value"/>
+            <description value="Checks 'Date of Birth' field validation for the France date format value"/>
+            <severity value="MAJOR"/>
             <group value="customer"/>
             <group value="ui"/>
         </annotations>

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersDeleteSystemCustomerGroupTest.xml
@@ -14,6 +14,7 @@
             <description value="Admin should not be able to delete system customer groups"/>
             <stories value="Delete System Customer Group" />
             <testCaseId value="MC-14588" />
+            <severity value="MAJOR"/>
             <group value="customers"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -46,4 +47,4 @@
         </actionGroup>
         <actionGroup ref="AssertDeleteCustomerGroupButtonMissingActionGroup" stepKey="verifyThereIsNoDeleteButtonForGeneralGroup"/>
     </test>
-</tests>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerSubscribeToNewsletterTest.xml
@@ -14,6 +14,7 @@
             <stories value="Subscribe To Newsletter Subscription on StoreFront"/>
             <title value="StoreFront Customer Newsletter Subscription"/>
             <description value="Customer can be subscribed to Newsletter Subscription on StoreFront"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/CreateCustomTemplateActionGroup.xml
@@ -9,6 +9,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomTemplateActionGroup" extends="CreateNewTemplateActionGroup">
+        <arguments>
+            <argument name="template" defaultValue="EmailTemplate"/>
+        </arguments>
         <remove keyForRemoval="selectValueFromTemplateDropDown"/>
         <remove keyForRemoval="clickLoadTemplateButton"/>