MC-24236: [MFTF Test] Unskip MFTF test MC-13607 "Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"

Author: Bohdan Shevchenko

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

@@ -18,7 +18,6 @@
             <argument name="productPrice" type="string" defaultValue="{{productWithHTMLEntityOne.price}}"/>
         </arguments>
 
-        <!-- Go to storefront category page, assert product visibility -->
         <amOnPage url="{{StorefrontCategoryPage.url(categoryUrl)}}" stepKey="navigateToCategoryPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <see userInput="{{productPrice}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(productName)}}" stepKey="assertProductPrice"/>

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

@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertStorefrontProductSpecialPriceInCategoryPageActionGroup" extends="AssertStorefrontProductPriceInCategoryPageActionGroup">
         <annotations>
-            <description>Goes to Storefront Category page for the provided Category. Validates that the Product price is present and correct.</description>
+            <description>Goes to Storefront Category page for the provided Category. Validates that the Product price and special price is correct.</description>
         </annotations>
         <arguments>
             <argument name="productSpecialPrice" type="string" defaultValue="{{updateVirtualProductSpecialPrice.special_price}}"/>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml

@@ -21,7 +21,7 @@
 
         <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
-        <element name="ProductCatalogRuleSpecialPriceTitleByName" type="text" selector="//main//li[.//a[contains(text(), '{{productName}}')]]//span[@class='special-price']/span" parameterized="true"/>
+        <element name="ProductCatalogRuleSpecialPriceTitleByName" type="text" selector="//div[contains(@class, 'product-item-info')][.//a[contains(text(), '{{productName}}')]]//span[@class='special-price']/span" parameterized="true"/>
         <element name="ProductCatalogRulePriceTitleByName" type="text" selector="//div[descendant::*[contains(text(), '{{var1}}')]]//*[contains(@class, 'price-label')]" parameterized="true"/>
         <element name="ProductImageByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[@class='product-image-photo']" parameterized="true"/>
         <element name="ProductImageBySrc" type="text" selector=".products-grid img[src*='{{pattern}}']" parameterized="true"/>

app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml

@@ -25,9 +25,7 @@
             <createData entity="productWithHTMLEntityOne" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer">
-                <field key="group_id">1</field>
-            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
 
             <!--Delete all Catalog Price Rule if exist-->
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
@@ -46,7 +44,7 @@
             <actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="clickSaveAndApplyRule"/>
 
             <!-- Perform reindex -->
- 	 	 	<magentoCLI command="indexer:reindex" arguments="catalogrule_rule" stepKey="reindex"/>
+            <magentoCLI command="indexer:reindex" arguments="catalogrule_rule" stepKey="reindex"/>
         </before>
         <after>
             <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
@@ -94,7 +92,7 @@
 
         <!--Click the *Not you?* link and check the price for Simple Product-->
         <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickNotYouLink"/>
-        <actionGroup ref="AssertDefaultWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnDoeCustomerAfterLogout"/>
+        <actionGroup ref="AssertStorefrontDefaultWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnDoeCustomerAfterLogout"/>
         <actionGroup ref="AssertStorefrontProductPriceInCategoryPageActionGroup" stepKey="assertProductPriceInCategoryPageAfterLogout">
             <argument name="categoryUrl" value="$createCategory.custom_attributes[url_key]$"/>
             <argument name="productName" value="$createProduct.name$"/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertDefaultWelcomeMessageActionGroup.xml

@@ -8,12 +8,12 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertDefaultWelcomeMessageActionGroup">
+    <actionGroup name="AssertStorefrontDefaultWelcomeMessageActionGroup">
         <annotations>
             <description>Validates that the Welcome message is present and correct and not you link absent.</description>
         </annotations>
 
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="waitDefaultMessage"/>
         <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="verifyDefaultMessage"/>
         <dontSeeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkAbsenceLinkNotYou"/>
     </actionGroup>