Merge branch 'ACQE-6818' into ACQE-functional-deployment-v7-1

Author: Karishmathakare19

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

@@ -13,6 +13,7 @@
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
         <element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
+        <element name="errorMsgText" type="button" selector="div.message-error > div" timeout="30"/>
         <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
         <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>

app/code/Magento/CatalogInventory/Test/Mftf/Test/StoreFrontAddOutOfStockProductToShoppingCartTest.xml

@@ -17,10 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="AC-5262"/>
             <group value="cloud"/>
-            <!-- Will be fixed in scope of ACQE-7385 -->
-            <group value="pr_exclude"/>
         </annotations>
-
         <before>
             <!-- Set Enable Inventory Check On Cart Load = No -->
             <magentoCLI command="config:set {{DisableInventoryCheckOnCartLoad.path}} {{DisableInventoryCheckOnCartLoad.value}}" stepKey="disableCartLoad"/>
@@ -46,6 +43,8 @@
             <magentoCLI command="config:set {{EnableInventoryCheckOnCartLoad.path}} {{EnableInventoryCheckOnCartLoad.value}}" stepKey="enableCartLoad"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
+        <!-- Mouse Hover Product On Category Page initial check-->
+        <actionGroup ref="StorefrontHoverProductOnCategoryPageActionGroup" stepKey="hoverProductInitial"/>
         <!-- Open New tab-->
         <openNewTab stepKey="openNewTab"/>
         <!-- Open Product From AdminPage-->
@@ -66,9 +65,9 @@
         <!-- Select Add to cart-->
         <waitForElementClickable selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="waitForAddToCartButton"/>
         <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="toCategory"/>
-        <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsg}}" stepKey="wait"/>
+        <waitForPageLoad stepKey="waitForPage"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.errorMsgText}}" stepKey="wait"/>
         <!-- Assert the Error Message-->
-        <see selector="{{StorefrontProductPageSection.errorMsg}}" userInput="Product that you are trying to add is not available." stepKey="seeErrorMessage"/>
+        <waitForText userInput="Product that you are trying to add is not available." selector="{{StorefrontProductPageSection.errorMsgText}}" stepKey="seeErrorMessage"/>
     </test>
-
 </tests>