Merge branch 'ACQE-6926' into functional-test-automation-deployment

Author: manjusha729

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup">
+        <annotations>
+            <description>Clicks the top "View Order" link on the My Account->My Orders page</description>
+        </annotations>
+        <arguments>
+            <argument name="orderID" type="string" defaultValue="1"/>
+        </arguments>
+        <waitForElementClickable selector="{{StorefrontCustomerOrderSection.viewOrderByOrderID(orderID)}}" stepKey="waitForViewOrderElementToBeClickable"/>
+        <click selector="{{StorefrontCustomerOrderSection.viewOrderByOrderID(orderID)}}" stepKey="clickViewOrder"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -23,5 +23,6 @@
         <element name="pageNumber" type="text" selector="//*[@class='order-products-toolbar toolbar bottom']//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
         <element name="perPage" type="select" selector="//*[@class='order-products-toolbar toolbar bottom']//select[@id='limiter']"/>
         <element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
+        <element name="viewOrderByOrderID" type="button" selector="//td[@data-th='Order #' and contains(text(), '{{orderID}}')]/following-sibling::td[@data-th='Actions']//a[contains(@class, 'action view')]//span" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Shipping/Test/Mftf/Test/StorefrontMultishippingCheckoutWithOnlineShippingMethodTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -101,22 +101,38 @@
             <executeJS function="var orderID = '{$grabOrderIdForThirdOrder}'.replace(/\D|^0+/g, ''); return (orderID);" stepKey="thirdOrderID"/>
             <grabTextFrom selector="{{AdminShipmentAddressInformationSection.multiCheckoutOrderId('4')}}" stepKey="grabOrderIdForFourthOrder"/>
             <executeJS function="var orderID = '{$grabOrderIdForFourthOrder}'.replace(/\D|^0+/g, ''); return (orderID);" stepKey="fourthOrderID"/>
-            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openFirstOrder">
+            <actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForFirstOrder"/>
+            <actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openFirstOrder">
+                 <argument name="orderID" value="{$firstOrderID}"/>
+            </actionGroup>
+            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenFirstOrder">
                 <argument name="orderId" value="$firstOrderID"/>
             </actionGroup>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('Berlin')}}" stepKey="waitForOrderInformationForBerlin"/>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('DHL - Express easy')}}" stepKey="waitForShippingMethodForDHL"/>
-            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openSecondOrder">
+            <actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForSecondOrder"/>
+            <actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openSecondOrder">
+                <argument name="orderID" value="{$secondOrderID}"/>
+            </actionGroup>
+            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenSecondOrder">
                 <argument name="orderId" value="$secondOrderID"/>
             </actionGroup>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('London')}}" stepKey="waitForOrderInformationForLondon"/>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('United Parcel Service - UPS Worldwide Expedited')}}" stepKey="waitForShippingMethodForUPS"/>
-            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openThirdOrder">
+            <actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForThirdOrder"/>
+            <actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openThirdOrder">
+                <argument name="orderID" value="{$thirdOrderID}"/>
+            </actionGroup>
+            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenThirdOrder">
                 <argument name="orderId" value="$thirdOrderID"/>
             </actionGroup>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('New York')}}" stepKey="waitForOrderInformationForNY"/>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderShippingMethod('United States Postal Service - Library Mail Parcel')}}" stepKey="waitForShippingMethodForUSPS"/>
-            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="openFourthOrder">
+            <actionGroup ref="StorefrontOpenMyOrdersPageActionGroup" stepKey="goToMyOrdersForFourthOrder"/>
+            <actionGroup ref="StorefrontOpenOrderLinkOnMyOrdersPageActionGroup" stepKey="openFourthOrder">
+                <argument name="orderID" value="{$fourthOrderID}"/>
+            </actionGroup>
+            <actionGroup ref="StorefrontOpenOrderViewPageActionGroup" stepKey="againOpenFourthOrder">
                 <argument name="orderId" value="$fourthOrderID"/>
             </actionGroup>
             <waitForElementVisible selector="{{AdminShipmentAddressInformationSection.orderInformationAddress('Culver City')}}" stepKey="waitForOrderInformationForCulverCity"/>