MC-4905: Convert CreateCustomUrlRewriteEntityTest to MFTF

Author: kanair

app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml

@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontUrlRewriteRedirect">
+    <actionGroup name="AssertStorefrontUrlRewriteRedirect">
         <arguments>
             <argument name="category" type="string"/>
             <argument name="newRequestPath" type="string"/>
@@ -18,7 +18,7 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(category)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
         <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(category)}}" stepKey="seeCategoryInTitle"/>
     </actionGroup>
-    <actionGroup name="StorefrontProductRedirect">
+    <actionGroup name="AssertStorefrontProductRedirect">
         <arguments>
             <argument name="productName" type="string"/>
             <argument name="productSku" type="string"/>

app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml

@@ -18,7 +18,7 @@
         <element name="redirectType" type="select" selector="//select[@id='redirect_type']"/>
         <element name="redirectTypeValue" type="select" selector="//select[@id='redirect_type']//option[contains(., '{{Var}}')]" parameterized="true"/>
         <element name="description" type="input" selector="#description"/>
-        <element name="categoryInTree" type="text" selector="//li[contains(@class,'active-category jstree-open')]/a[contains(., '{{var}}')]" parameterized="true"/>
+        <element name="categoryInTree" type="text" selector="//li[contains(@class,'active-category jstree-open')]/a[contains(., '{{categoryName}}')]" parameterized="true"/>
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
         <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
         <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']" timeout="30"/>

app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml

@@ -20,6 +20,6 @@
         <element name="requestPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='request_path']" parameterized="true"/>
         <element name="emptyRecords" type="text" selector="//td[@class='empty-text']"/>
         <element name="successMessage" type="text" selector="#messages"/>
-        <element name="editButton" type="text" selector="//tr[@data-role='row'][{{var1}}]/td/a[contains(.,'Edit')]" parameterized="true"/>
+        <element name="editButton" type="text" selector="//tr[@data-role='row'][{{rowNumber}}]/td/a[contains(.,'Edit')]" parameterized="true"/>
     </section>
 </sections>

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

@@ -60,13 +60,13 @@
         </actionGroup>
 
         <!-- Assert updated Category redirect in Store Front -->
-        <actionGroup ref="StorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront">
             <argument name="category" value="$$category.name$$"/>
             <argument name="newRequestPath" value="{{FirstLevelSubCat.name}}.html"/>
         </actionGroup>
 
         <!-- Assert initial Category redirect in Store Front -->
-        <actionGroup ref="StorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront1">
+        <actionGroup ref="AssertStorefrontUrlRewriteRedirect" stepKey="verifyCategoryInStoreFront1">
             <argument name="category" value="$$category.name$$"/>
             <argument name="newRequestPath" value="catalog/category/view/id/{$categoryId}"/>
         </actionGroup>

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

@@ -60,14 +60,14 @@
         </actionGroup>
 
         <!-- Assert updated product redirect in Store Front-->
-        <actionGroup ref="StorefrontProductRedirect" stepKey="verifyProductInStoreFront">
+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFront">
             <argument name="productName" value="$$createProduct.name$$"/>
             <argument name="productSku" value="$$createProduct.sku$$"/>
             <argument name="productRequestPath" value="{{_defaultProduct.name}}.html"/>
         </actionGroup>
 
         <!-- Assert initial product redirect in Store Front-->
-        <actionGroup ref="StorefrontProductRedirect" stepKey="verifyProductInStoreFront1">
+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="verifyProductInStoreFront1">
             <argument name="productName" value="$$createProduct.name$$"/>
             <argument name="productSku" value="$$createProduct.sku$$"/>
             <argument name="productRequestPath" value="$$createProduct.name$$.html"/>