B2B-1703: Add MFTF test for MC-38558

dhaecker · dhaecker · commit 1256e3b81f0d · 2021-03-06T19:38:24.000-06:00
- Fixing incorrect data references
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -68,13 +68,13 @@
         <!--See related product in admin-->
         <scrollTo selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" stepKey="scrollTo"/>
         <conditionalClick selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDropdown}}" dependentSelector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedDependent}}" visible="false" stepKey="openDropDownIfClosedRelatedSee"/>
-        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProduct"/>
+        <see selector="{{AdminProductFormRelatedUpSellCrossSellSection.selectedRelatedProduct}}" userInput="$$simpleProduct1.name$$" stepKey="seeRelatedProduct"/>
 
         <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
 
         <!--See related product in storefront-->
         <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
-        <see userInput="$$simpleProduct1.sku$$" stepKey="seeRelatedProductInStorefront"/>
+        <see userInput="$$simpleProduct1.name$$" stepKey="seeRelatedProductInStorefront"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -67,8 +67,8 @@
     </entity>
     <entity name="FifthLevelCat" type="category">
         <data key="name" unique="suffix">FifthLevelCategory</data>
-        <data key="name_lwr" unique="suffix">fifthlevelsubcategory</data>
-        <data key="urlKey" unique="suffix">fifthlevelsubcategory</data>
+        <data key="name_lwr" unique="suffix">fifthlevelcategory</data>
+        <data key="urlKey" unique="suffix">fifthlevelcategory</data>
     </entity>
     <entity name="SimpleRootSubCategory" type="category">
         <data key="name" unique="suffix">SimpleRootSubCategory</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -11,7 +11,7 @@
     <entity name="_defaultProduct" type="product">
         <data key="name" unique="suffix">testProductName</data>
         <data key="sku" unique="suffix">testSku</data>
-        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="urlKey" unique="suffix">testproductname</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
         <data key="visibility">4</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -78,6 +78,6 @@
         <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="seeProductInCategory"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="seeProductInCategory"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml
@@ -85,7 +85,7 @@
         <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="seeProductInCategory"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="seeProductInCategory"/>
         <dontSeeElement selector="{{StorefrontCategorySidebarSection.filterOptions}}" stepKey="dontSeeFilterOptionsForNonAnchorCategory"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -140,7 +140,7 @@
         <see userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProduct"/>
 
         <!-- Open <product1>  -->
-        <click selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="openProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="openProduct"/>
         <waitForPageLoad stepKey="waitForProductPageLoading"/>
 
         <!-- # Product page should open successfully # Breadcrumb for product should be like <Cat 2> -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
@@ -158,7 +158,7 @@
         <!--Go to SimpleProduct store front page-->
         <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductFrontPage"/>
         <waitForPageLoad stepKey="waitForProduct"/>
-        <see stepKey="seeProductName" userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontProductInfoMainSection.productName}}"/>
+        <see stepKey="seeProductName" userInput="$$createSimpleProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}"/>
         <scrollTo stepKey="scrollToTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}"/>
 
         <!--Verify Up Sell Products displayed in SimpleProduct page-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
@@ -78,8 +78,8 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
 
         <executeJS function="return '$createCategory.name$'.toLowerCase();" stepKey="categoryNameLower" />
-        <executeJS function="return '$createSimpleProductFirst.urlKey$'.toLowerCase();" stepKey="simpleProductFirstNameLower" />
-        <executeJS function="return '$createSimpleProductSecond.urlKey$'.toLowerCase();" stepKey="simpleProductSecondNameLower" />
+        <executeJS function="return '$createSimpleProductFirst.custom_attributes[url_key]$'.toLowerCase();" stepKey="simpleProductFirstNameLower" />
+        <executeJS function="return '$createSimpleProductSecond.custom_attributes[url_key]$'.toLowerCase();" stepKey="simpleProductSecondNameLower" />
 
         <!-- Make assertions on frontend -->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -37,7 +37,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}?filters[sku]=$createSimpleProduct.custom_attributes[url_key]$" stepKey="navigateToProductGridWithFilters"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[sku]=$createSimpleProduct.sku$" stepKey="navigateToProductGridWithFilters"/>
         <waitForPageLoad stepKey="waitForProductGrid"/>
         <see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
         <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -105,6 +105,6 @@
         <!--See related product in storefront-->
         <amOnPage url="{{SimpleProduct3.urlKey}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
-        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$simpleProduct1.sku$$)}}" stepKey="seeRelatedProductInStorefront"/>
+        <seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$simpleProduct1.name$$)}}" stepKey="seeRelatedProductInStorefront"/>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/ActionGroup/AssertStorefrontProductRewriteUrlSubCategoryActionGroup.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/ActionGroup/AssertStorefrontProductRewriteUrlSubCategoryActionGroup.xml
@@ -15,7 +15,7 @@
             <argument name="product" defaultValue="SimpleProduct" />
         </arguments>
 
-        <amOnPage url="{{category}}/{{product.urlKey}}.html" stepKey="goToProductPage"/>
+        <amOnPage url="{{category}}/{{product.urlKey}}2.html" stepKey="goToProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{product.name}}" stepKey="seeProductNameInStoreFront"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -65,10 +65,10 @@
         <!--Go to cart page, update qty and proceed to checkout-->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
         <see userInput="Shopping Cart" stepKey="seeCartPageIsOpened"/>
-        <fillField selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" userInput="2" stepKey="updateProductQty"/>
+        <fillField selector="{{CheckoutCartProductSection.qty($$createProduct.sku$$)}}" userInput="2" stepKey="updateProductQty"/>
         <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
         <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQty"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.sku$$)}}" stepKey="grabQty"/>
         <assertEquals stepKey="assertQty">
 			<actualResult type="const">$grabQty</actualResult>
 			<expectedResult type="const">2</expectedResult>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAssertFixedCartDiscountAmountForBundleProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAssertFixedCartDiscountAmountForBundleProductTest.xml
@@ -33,8 +33,8 @@
             <argument name="productUrl" value="$$createBundleProductCreateBundleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
         <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
-        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectOption0Product1"/>
-        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkOption0Product1"/>
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.name$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectOption0Product1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.name$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkOption0Product1"/>
         <checkOption selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Radio Buttons Option', '1')}}" stepKey="selectOption1Product0"/>
         <seeCheckboxIsChecked selector="{{StorefrontBundledSection.radioButtonOptionTwoProducts('Radio Buttons Option', '1')}}" stepKey="checkOption1Product0"/>
         <checkOption selector="{{StorefrontBundledSection.checkboxOptionThreeProducts('Checkbox Option', '1')}}" stepKey="selectOption2Product0"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminAutoUpdateURLRewriteWhenCategoryIsDeletedTest.xml
@@ -53,7 +53,7 @@
 
         <!-- Assert Redirect path, Target Path and Redirect type in grid -->
         <actionGroup ref="AdminSearchByRequestPathActionGroup" stepKey="searchByRequestPath">
-            <argument name="redirectPath" value="$$createSimpleProduct.urlKey$$.html" />
+            <argument name="redirectPath" value="$$createSimpleProduct.custom_attributes[url_key]$$.html" />
             <argument name="redirectType" value="No" />
             <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
         </actionGroup>
@@ -62,12 +62,12 @@
         <actionGroup ref="AdminSearchByRequestPathActionGroup" stepKey="searchByRequestPath1">
             <argument name="redirectPath" value="{{_defaultProduct.urlKey}}.html" />
             <argument name="redirectType" value="Temporary (302)"/>
-            <argument name="targetPath" value="$$createSimpleProduct.urlKey$$.html"/>
+            <argument name="targetPath" value="$$createSimpleProduct.custom_attributes[url_key]$$.html"/>
         </actionGroup>
 
         <!--Assert Category Url Redirect is not present -->
         <actionGroup ref="AdminSearchDeletedUrlRewriteActionGroup" stepKey="searchDeletedCategory">
-            <argument name="requestPath" value="$$createCategory.urlKey$$.html"/>
+            <argument name="requestPath" value="$$createCategory.custom_attributes[url_key]$$.html"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductURLRewriteWithCategoryAndAddTemporaryRedirectTest.xml
@@ -47,7 +47,7 @@
         <actionGroup ref="AdminSearchByRequestPathActionGroup" stepKey="searchByRequestPath">
             <argument name="redirectPath" value="{{FirstLevelSubCat.name_lwr}}/{{_defaultProduct.urlKey}}.html" />
             <argument name="redirectType" value="Temporary (302)" />
-            <argument name="targetPath" value="$$createSimpleProduct.urlKey$$.html"/>
+            <argument name="targetPath" value="$$createSimpleProduct.custom_attributes[url_key]$$.html"/>
         </actionGroup>
 
         <!--Filter Product in product page and get the Product ID -->
@@ -58,7 +58,7 @@
 
         <!-- Assert Redirect path, Target Path and Redirect type in grid -->
         <actionGroup ref="AdminSearchByRequestPathActionGroup" stepKey="searchByRequestPath1">
-            <argument name="redirectPath" value="$$createSimpleProduct.urlKey$$.html" />
+            <argument name="redirectPath" value="$$createSimpleProduct.custom_attributes[url_key]$$.html" />
             <argument name="redirectType" value="No" />
             <argument name="targetPath" value="catalog/product/view/id/{$productId}"/>
         </actionGroup>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddBundleProductToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddBundleProductToWishlistTest.xml
@@ -84,7 +84,7 @@
         <actionGroup ref="AssertProductDetailsInWishlistActionGroup" stepKey="assertProductDetails">
             <argument name="productName" value="$$createBundleProduct.name$$"/>
             <argument name="label" value="$$createBundleOption1_1.title$$"/>
-            <argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
+            <argument name="labelValue" value="$$simpleProduct1.name$$ $100.00"/>
         </actionGroup>
 
         <!-- Assert product cart is empty -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -101,7 +101,7 @@
         <actionGroup ref="AssertProductDetailsInWishlistActionGroup" stepKey="assertProductDetails">
             <argument name="productName" value="$$createBundleProduct.name$$"/>
             <argument name="label" value="$$createBundleOption1_1.title$$"/>
-            <argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
+            <argument name="labelValue" value="$$simpleProduct1.name$$ $100.00"/>
         </actionGroup>
 
         <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
@@ -92,7 +92,7 @@
         <actionGroup ref="AssertProductDetailsInWishlistActionGroup" stepKey="assertProductDetails">
             <argument name="productName" value="$$createBundleProduct.name$$"/>
             <argument name="label" value="$$createBundleOption1_1.title$$"/>
-            <argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
+            <argument name="labelValue" value="$$simpleProduct1.name$$ $100.00"/>
         </actionGroup>
 
         <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
