33326-Resolved the merged conflict

Author: Indrani sonawane

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

@@ -53,7 +53,7 @@
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption1"/>
             </createData>
-             <!--Create a simple product and give it the attribute with the second option -->
+            <!--Create a simple product and give it the attribute with the second option -->
             <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption2"/>
@@ -93,11 +93,6 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductToLoad"/>
 
         <!--Verify Product is visible and In Stock -->
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage"/>
-        <actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductNameInStoreFront">
-            <argument name="value" value="$$createConfigProduct.name$$"/>
-        </actionGroup>
-        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
         <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCategoryInFrontPage">
             <argument name="categoryName" value="$$createCategory.name$$"/>
         </actionGroup>
@@ -134,11 +129,6 @@
             <argument name="productName" value="$$createConfigProduct.name$$"/>
         </actionGroup>
         <!--Open Product Store Front Page and Verify Product is Out Of Stock -->
-        <amOnPage url="$$createConfigProduct.custom_attributes[url_key]$$.html" stepKey="openProductInStoreFront1"/>
-        <waitForPageLoad stepKey="waitForProductToLoad1"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage1"/>
-        <actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductNameInStoreFront1">
-            <argument name="value" value="$$createConfigProduct.name$$"/>
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductInStoreFront1">
             <argument name="product" value="$createConfigProduct$"/>
         </actionGroup>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml

@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontProductNameWithHTMLEntitiesTest">
         <annotations>
             <features value="Catalog"/>
@@ -48,11 +48,6 @@
         </actionGroup>
 
         <!--Open product display page-->
-        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" stepKey="clickProductToGoProductPage"/>
-        <waitForPageLoad stepKey="waitForProductDisplayPageLoad2"/>
-
-        <actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeCorrectName">
-            <argument name="value" value="{{productWithHTMLEntityOne.name}}"/>
         <actionGroup ref="StorefrontOpenProductFromCategoryPageActionGroup" stepKey="clickProductToGoProductPage">
             <argument name="productName" value="{{productWithHTMLEntityOne.name}}"/>
         </actionGroup>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest/StorefrontConfigurableProductCanAddToCartTest.xml

@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductCanAddToCartTest">
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -47,14 +47,6 @@
         </after>
 
         <!-- Verify adding configurable product to cart after an option is selected in storefront product view -->
-
-        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
-        <waitForPageLoad stepKey="wait"/>
-        <actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductName">
-            <argument name="value" value="{{_defaultProduct.name}}"/>
-        </actionGroup>
-        <selectOption userInput="{{colorProductAttribute1.name}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption1"/>
-
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="amOnConfigurableProductPage">
             <argument name="productUrlKey" value="{{_defaultProduct.urlKey}}"/>
         </actionGroup>
@@ -66,7 +58,6 @@
             <argument name="attributeLabel" value="{{colorProductAttribute.default_label}}"/>
             <argument name="optionLabel" value="{{colorProductAttribute1.name}}"/>
         </actionGroup>
-
         <waitForElementVisible selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="waitForAddToCartVisible"/>
         <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
             <argument name="product" value="_defaultProduct"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest/StorefrontConfigurableProductCantAddToCartTest.xml

@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductCantAddToCartTest">
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -47,10 +47,6 @@
         </after>
 
         <!-- Verify not able to add configurable product to cart when no option is selected in storefront product view -->
-        <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="amOnConfigurableProductPage"/>
-        <waitForPageLoad stepKey="wait"/>
-        <actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeProductName">
-            <argument name="value" value="{{_defaultProduct.name}}"/>
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="amOnConfigurableProductPage">
             <argument name="productUrlKey" value="{{_defaultProduct.urlKey}}"/>
         </actionGroup>