Merge remote-tracking branch 'origin/MC-42004' into 2.4-develop-jet-pr1

Author: zakdma

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml

@@ -26,7 +26,8 @@
         <element name="shippingBlock" type="text" selector="#checkout-step-shipping"/>
 
         <!--Order Summary-->
-        <element name="itemInCart" type="button" selector="//div[@class='title']"/>
+        <element name="itemInCart" type="button" selector="div.items-in-cart div.title" timeout="30"/>
+        <element name="itemInCartActive" type="button" selector="div.items-in-cart.active div.title" timeout="30"/>
         <element name="productName" type="text" selector="//strong[@class='product-item-name']"/>
     </section>
 </sections>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml

@@ -15,7 +15,7 @@
             <title value="Checking Product name in Minicart and on Checkout page with different store views"/>
             <description value="Checking Product name in Minicart and on Checkout page with different store views"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-96466"/>
+            <testCaseId value="MC-28566"/>
             <useCaseId value="MAGETWO-96421"/>
             <group value="checkout"/>
         </annotations>
@@ -31,6 +31,7 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -95,8 +96,8 @@
 
         <!--Proceed to checkout and check product name in Order Summary area-->
         <actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="proceedToCheckout"/>
-        <comment userInput="Adding the comment to replace waitForShippingPageLoad action for preserving Backward Compatibility" stepKey="waitForShippingPageLoad"/>
-        <click selector="{{CheckoutShippingGuestInfoSection.itemInCart}}" stepKey="clickItemInCart"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForShippingPageLoad"/>
+        <conditionalClick selector="{{CheckoutShippingGuestInfoSection.itemInCart}}" dependentSelector="{{CheckoutShippingGuestInfoSection.itemInCartActive}}" visible="false" stepKey="clickItemInCart"/>
         <grabTextFrom selector="{{CheckoutShippingGuestInfoSection.productName}}" stepKey="grabProductNameShipping"/>
         <assertStringContainsString stepKey="assertProductNameShipping">
 			<actualResult type="const">$grabProductNameShipping</actualResult>