Merge branch 'MC-4306' into MC-15981

Author: dhaecker

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

@@ -11,6 +11,7 @@
     <test name="AdminCloneProductWithDuplicateUrlTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Product"/>
             <title value="Cloning a product with duplicate URL key"/>
             <description value="Check product cloning with duplicate URL key"/>
             <severity value="AVERAGE"/>

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

@@ -11,6 +11,7 @@
     <test name="AdminRestrictedUserAddCategoryFromProductPageTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Category"/>
             <title value="Adding new category from product page by restricted user"/>
             <description value="Adding new category from product page by restricted user"/>
             <severity value="MAJOR"/>

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

@@ -11,6 +11,7 @@
     <test name="CheckCurrentCategoryIsHighlightedAndProductsDisplayed">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Category"/>
             <title value="Сheck that current category is highlighted and all products displayed for it"/>
             <description value="Сheck that current category is highlighted and all products displayed for it"/>
             <severity value="MAJOR"/>

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

@@ -11,6 +11,7 @@
     <test name="AdminCheckConfigurableProductAttributeValueUniquenessTest">
         <annotations>
             <features value="ConfigurableProduct"/>
+            <stories value="Configurable Product"/>
             <title value="Attribute value validation (check for uniqueness) in configurable products"/>
             <description value="Attribute value validation (check for uniqueness) in configurable products"/>
             <severity value="MAJOR"/>

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

@@ -10,6 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="NoOptionAvailableToConfigureDisabledProductTest">
         <annotations>
+            <stories value="Disabled Product"/>
             <title value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
             <description value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
             <severity value="AVERAGE"/>

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

@@ -9,6 +9,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontVisibilityOfDuplicateProductTest">
         <annotations>
+            <stories value="Duplicate Product"/>
             <features value="ConfigurableProduct"/>
             <title value="Visibility of duplicate product on the Storefront"/>
             <description value="Check visibility of duplicate product on the Storefront"/>

app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml

@@ -17,6 +17,9 @@
             <testCaseId value="MC-16183"/>
             <group value="sales"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-18275"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml

@@ -17,6 +17,9 @@
             <testCaseId value="MC-16184"/>
             <group value="sales"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-18275"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>