Merge branch 'ACQE-8368' into ACQE-functional-deployment-version15

Author: chandrakalahanchinal

app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.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 2018 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -11,6 +11,6 @@
     <section name="AdminEditCustomerOrdersSection">
         <element name="orderGrid" type="text" selector="#customer_orders_grid_table"/>
         <element name="orderIdInGrid" type="text" selector="//td[contains(., '{{orderId}}')]" parameterized="true"/>
-        <element name="orderIdInGridUsingClassName" type="text" selector="//td[@class=' col-increment_id                                        ' and contains(., '{{orderId}}')]" parameterized="true"/>
+        <element name="orderIdInGridUsingClassName" type="text" selector="//td[contains(normalize-space(@class), 'col-increment_id') and contains(., '{{orderId}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderByIdFromOrdersGridOnCustomerEditPageActionGroup.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 2021 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -16,7 +16,7 @@
             <argument name="orderId" type="string"/>
         </arguments>
 
-        <click selector="{{AdminEditCustomerOrdersSection.orderIdInGridUsingClassName('$orderId')}}" stepKey="selectOrderById"/>
+        <click selector="{{AdminEditCustomerOrdersSection.orderIdInGridUsingClassName(orderId)}}" stepKey="selectOrderById"/>
         <waitForPageLoad stepKey="waitForOrderPageToOpen"/>
 
     </actionGroup>