ACQE-8433: Verify the 'Email sent' message is displaying in the header by generating email for invoice, shipment and credit memo

- Updated generic name for emailMessage, moved after  block and removed unused file

Author: shweta-tripathi-1519

app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml

@@ -46,8 +46,7 @@
         <data key="ordered">Ordered</data>
     </entity>
     <entity name="AdminOrderEmailsSendMessage" type="text">
-        <data key="invoiceEmailSuccessMessage">You sent the message.</data>
+        <data key="emailSuccessMessage">You sent the message.</data>
         <data key="shipmentEmailSuccessMessage">You sent the shipment.</data>
-        <data key="creditMemoEmailSuccessMessage">You sent the message.</data>
     </entity>
 </entities>

app/code/Magento/Sales/Test/Mftf/Data/PaymentConfigData.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright 2019 Adobe
-  * All Rights Reserved.
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
   */
 -->
 

app/code/Magento/Sales/Test/Mftf/Test/AdminOrderEmailsConfirmationMessageTest.xml

@@ -24,6 +24,15 @@
             <!-- Create customer -->
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
+        <after>
+            <!-- Delete product and customer -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Logout from admin -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <!-- Logout from storefront -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+        </after>
         <!-- Step 1: Go to frontend and log in as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$$createCustomer$$"/>
@@ -61,7 +70,7 @@
         <!-- Assert invoice email confirmation -->
         <assertEquals stepKey="assertInvoiceEmailConfirmation">
             <actualResult type="const">$grabInvoiceSuccessMessage</actualResult>
-            <expectedResult type="string">{{AdminOrderEmailsSendMessage.invoiceEmailSuccessMessage}}</expectedResult>
+            <expectedResult type="string">{{AdminOrderEmailsSendMessage.emailSuccessMessage}}</expectedResult>
         </assertEquals>
         <!-- Step 9: Send shipment email -->
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderInAdmin1">
@@ -94,16 +103,7 @@
         <!-- Assert credit memo email confirmation -->
         <assertEquals stepKey="assertCreditMemoEmailConfirmation">
             <actualResult type="const">$grabCreditMemoSuccessMessage</actualResult>
-            <expectedResult type="string">{{AdminOrderEmailsSendMessage.creditMemoEmailSuccessMessage}}</expectedResult>
+            <expectedResult type="string">{{AdminOrderEmailsSendMessage.emailSuccessMessage}}</expectedResult>
         </assertEquals>
-        <after>
-            <!-- Delete product and customer -->
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <!-- Logout from admin -->
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
-            <!-- Logout from storefront -->
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-        </after>
     </test>
 </tests>