Merge remote-tracking branch 'origin/MC-40205' into 2.4-develop-jet-pr1

Author: oleg-onufer

app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml

@@ -15,16 +15,13 @@
             <title value="Guest customer should be able to advance search Grouped product with product sku that in camelCase format"/>
             <description value="Guest customer should be able to advance search Grouped product with product sku that in camelCase format"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MC-20519"/>
+            <testCaseId value="MC-28832"/>
             <group value="GroupedProduct"/>
             <group value="SearchEngineElasticsearch"/>
-            <skip>
-                  <issueId value="MC-34217"/>
-           </skip>
         </annotations>
         <before>
-            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
-            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+            <createData entity="ApiProductWithDescription" before="simple2" stepKey="simple1"/>
+            <createData entity="ApiProductWithDescription" before="product" stepKey="simple2"/>
             <createData entity="ApiGroupedProduct" stepKey="product"/>
             <createData entity="OneSimpleProductLink" stepKey="addProductOne">
                 <requiredEntity createDataKey="product"/>
@@ -42,8 +39,8 @@
             </actionGroup>
         </before>
         <after>
-            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
-            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="simple1"  before="deleteSimple2" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="simple2" before="delete" stepKey="deleteSimple2"/>
         </after>
     </test>
 </tests>