Skip to content

Commit ba15968

Browse files
ACQE-8433: Verify the 'Email sent' message is displaying in the header by generating email for invoice, shipment and credit memo
- Updated data entity names, removed checkmoney enabled/disabled code
1 parent eb83bb9 commit ba15968

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<data key="ordered">Ordered</data>
4747
</entity>
4848
<entity name="AdminOrderEmailsSendMessage" type="text">
49-
<data key="message">You sent the message.</data>
50-
<data key="shipmentMessage">You sent the shipment.</data>
49+
<data key="invoiceEmailSuccessMessage">You sent the message.</data>
50+
<data key="shipmentEmailSuccessMessage">You sent the shipment.</data>
51+
<data key="creditMemoEmailSuccessMessage">You sent the message.</data>
5152
</entity>
5253
</entities>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<data key="label">payment/checkmo/active</data>
1313
<data key="value">1</data>
1414
</entity>
15-
<entity name="disabledCheckMoneyOrder" type="config">
16-
<data key="label">payment/checkmo/active</data>
17-
<data key="value">0</data>
18-
</entity>
1915
<entity name="enabledBankTransferPaymentOrder" type="config">
2016
<data key="label">payment/banktransfer/active</data>
2117
<data key="value">1</data>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
<group value="Sales"/>
2020
</annotations>
2121
<before>
22-
<!-- Enable payment method one of "check/money order" -->
23-
<magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
2422
<!-- Create simple product -->
2523
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
2624
<!-- Create customer -->
@@ -63,7 +61,7 @@
6361
<!-- Assert invoice email confirmation -->
6462
<assertEquals stepKey="assertInvoiceEmailConfirmation">
6563
<actualResult type="const">$grabInvoiceSuccessMessage</actualResult>
66-
<expectedResult type="string">{{AdminOrderEmailsSendMessage.message}}</expectedResult>
64+
<expectedResult type="string">{{AdminOrderEmailsSendMessage.invoiceEmailSuccessMessage}}</expectedResult>
6765
</assertEquals>
6866
<!-- Step 9: Send shipment email -->
6967
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderInAdmin1">
@@ -80,7 +78,7 @@
8078
<!-- Assert shipment email confirmation -->
8179
<assertEquals stepKey="assertShipmentEmailConfirmation">
8280
<actualResult type="const">$grabShipmentSuccessMessage</actualResult>
83-
<expectedResult type="string">{{AdminOrderEmailsSendMessage.shipmentMessage}}</expectedResult>
81+
<expectedResult type="string">{{AdminOrderEmailsSendMessage.shipmentEmailSuccessMessage}}</expectedResult>
8482
</assertEquals>
8583
<!-- Step 10: Send credit memo email -->
8684
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderInAdmin2">
@@ -96,7 +94,7 @@
9694
<!-- Assert credit memo email confirmation -->
9795
<assertEquals stepKey="assertCreditMemoEmailConfirmation">
9896
<actualResult type="const">$grabCreditMemoSuccessMessage</actualResult>
99-
<expectedResult type="string">{{AdminOrderEmailsSendMessage.message}}</expectedResult>
97+
<expectedResult type="string">{{AdminOrderEmailsSendMessage.creditMemoEmailSuccessMessage}}</expectedResult>
10098
</assertEquals>
10199
<after>
102100
<!-- Delete product and customer -->
@@ -106,8 +104,6 @@
106104
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
107105
<!-- Logout from storefront -->
108106
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
109-
<!-- Disable payment method "Check/Money Order" -->
110-
<magentoCLI command="config:set {{disabledCheckMoneyOrder.label}} {{disabledCheckMoneyOrder.value}}" stepKey="disableCheckMoneyOrder"/>
111107
</after>
112108
</test>
113109
</tests>

0 commit comments

Comments
 (0)