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

Author: svitja

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

@@ -399,19 +399,19 @@
 
     <actionGroup name="AdminCategoryAssignProduct">
         <annotations>
-            <description>Assign products to category - using "Products in Category" tab.</description>
+            <description>Requires navigation to category creation/edit page. Assign products to category - using "Products in Category" tab.</description>
         </annotations>
         <arguments>
             <argument name="productSku" type="string"/>
         </arguments>
 
         <conditionalClick selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" dependentSelector="{{CatalogProductsSection.resetFilter}}" visible="false" stepKey="clickOnProductInCategory"/>
-        <waitForPageLoad stepKey="waitForProductsInCategoryOpened"/>
+        <waitForPageLoad time="30" stepKey="waitForProductsInCategoryOpened"/>
         <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-        <waitForPageLoad stepKey="waitForProductsToLoad"/>
+        <waitForPageLoad time="30" stepKey="waitForProductsToLoad"/>
         <fillField selector="{{AdminCategoryContentSection.productTableColumnSku}}" userInput="{{productSku}}" stepKey="selectProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearch"/>
+        <waitForPageLoad time="30" stepKey="waitForSearch"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
     </actionGroup>
 </actionGroups>

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

@@ -11,10 +11,12 @@
     <test name="AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKey">
         <annotations>
             <stories value="Product"/>
+            <features value="Catalog"/>
             <title value="Product custom URL Key is preserved when assigned to a Category (without custom URL Key) alongside with another Product without custom URL Key"/>
             <description value="The test verifies that product custom URL Key is preserved when assigned to a Category (without custom URL Key) alongside with another Product without custom URL Key."/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-6443"/>
+            <useCaseId value="MAGETWO-90331"/>
             <group value="catalog"/>
         </annotations>
         <before>
@@ -74,9 +76,9 @@
 
         <actionGroup ref="saveCategoryForm" stepKey="saveCategory"/>
 
-        <executeJS function="var s = '$createCategory.name$'; var res=s.toLowerCase(); return res;" stepKey="categoryNameLower" />
-        <executeJS function="var s = '$createSimpleProductFirst.name$'; var res=s.toLowerCase(); return res;" stepKey="simpleProductFirstNameLower" />
-        <executeJS function="var s = '$createSimpleProductSecond.name$';var res=s.toLowerCase(); return res;" stepKey="simpleProductSecondNameLower" />
+        <executeJS function="return '$createCategory.name$'.toLowerCase();" stepKey="categoryNameLower" />
+        <executeJS function="return '$createSimpleProductFirst.name$'.toLowerCase();" stepKey="simpleProductFirstNameLower" />
+        <executeJS function="return '$createSimpleProductSecond.name$'.toLowerCase();" stepKey="simpleProductSecondNameLower" />
 
         <!-- Make assertions on frontend -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
@@ -85,11 +87,13 @@
 
         <!-- Open first product -->
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($createSimpleProductFirst.name$)}}" stepKey="openFirstProduct"/>
+        <waitForPageLoad time="30" stepKey="waitForFirstProduct"/>
         <seeInCurrentUrl url="{$simpleProductFirstNameLower}.html" stepKey="checkFirstSimpleProductUrlKey"/>
 
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryView"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="onCategoryView"/>
         <!-- Open second product  -->
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($createSimpleProductSecond.name$)}}" stepKey="openSecondProduct"/>
+        <waitForPageLoad time="30" stepKey="waitForSecondProduct"/>
         <seeInCurrentUrl url="{$simpleProductSecondNameLower}.html" stepKey="checkSecondSimpleProductUrlKey"/>
 
         <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
@@ -101,11 +105,13 @@
 
         <!-- Open product first  -->
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProductFirst.name$$)}}" stepKey="openFirstSimpleProduct"/>
+        <waitForPageLoad time="30" stepKey="waitForFirstSimpleProduct"/>
         <seeInCurrentUrl url="{$simpleProductFirstNameLower}.html" stepKey="assertFirstSimpleProductUrlKey"/>
 
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($createCategory.name$)}}" stepKey="openCategoryView"/>
         <!-- Open product2  -->
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($createSimpleProductSecond.name$)}}" stepKey="openSecondSimpleProduct"/>
+        <waitForPageLoad time="30" stepKey="waitForSecondSimpleProduct"/>
         <seeInCurrentUrl url="u2.html" stepKey="assertSecondSimpleProductUrlKey"/>
     </test>
 </tests>