MC-6463: Product custom URL Key is preserved when assigned to a Category (with custom URL Key) alongside with another Product without custom URL Key

Author: OleksandrBurianyk

app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminProductCreateUrlRewriteForCustomStoreViewTest.xml

@@ -15,7 +15,8 @@
             <description value="Verify Product custom URL Key (for custom Store View) is preserved when assigned to a Category (with custom URL Key) alongside with another Product without custom URL Key"/>
             <testCaseId value="MC-6463"/>
             <severity value="MAJOR"/>
-            <group value="mtf_migrated"/>
+            <group value="catalog"/>
+            <group value="url_rewrite"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -25,11 +26,12 @@
             <createData entity="SimpleProduct" stepKey="createProductForUrlRewrite">
                <requiredEntity createDataKey="createCategory" />
             </createData>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-            <!--             Create second store view-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create second store view -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
+            <magentoCLI command="indexer:reindex" stepKey="runReindex"/>
         </before>
         <after>
             <deleteData createDataKey="createProduct"  stepKey="deleteProduct" />
@@ -39,7 +41,7 @@
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
             <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="clearFilterForStores"/>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <!--Step 1. Navigate as Admin on Product Page for edit product`s Url Key-->
         <actionGroup ref="navigateToCreatedProductEditPage" stepKey="goToProductForUrlRewrite">
@@ -70,17 +72,19 @@
             <argument name="newRequestPath" value="u1.html"/>
         </actionGroup>
         <!--Step 6. On Storefront Assert what URL Key for product is correct(as initial URL) -->
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="amOnStorefrontProduct">
-            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="navigateToProductInDefaultStore">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductUrl">
             <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
         <!--Step 7. On Storefront Assert what URL Key for product is correct for Default Store View (as initial URL) -->
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="amOnStorefrontProductWithChangedUrl">
-            <argument name="productUrl" value="$$createProductForUrlRewrite.custom_attributes[url_key]$$"/>
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="navigateToProductForUrlRewriteInDefaultStore">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="product" value="$$createProductForUrlRewrite$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductWithChangedUrl">
+         <actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductWithChangedUrl">
             <argument name="productUrl" value="$$createProductForUrlRewrite.custom_attributes[url_key]$$"/>
         </actionGroup>
         <!--Step 8. On Storefront switch on created Custom Store View -->
@@ -93,10 +97,11 @@
             <argument name="newRequestPath" value="u1.html"/>
         </actionGroup>
         <!--Step 10. On Storefront Assert what URL Key for product is correct for Custom Store View (as initial URL) -->
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="amOnCustomStoreProduct">
-            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="navigateToProductInCustomStore">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductP1UrlonCustomStore">
+        <actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductUrlOnCustomStore">
             <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
         <!--Step 11. On Storefront Assert what URL Key for product is changed and is correct for Custom Store View -->