Skip to content

Commit 21caabd

Browse files
committed
ACP2E-1063: received duplicate emails after created an order from admin
1 parent 6720ce9 commit 21caabd

File tree

1 file changed

+7
-7
lines changed
  • dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder

1 file changed

+7
-7
lines changed

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,13 @@ public function testCreateOrderExistingCustomer()
644644

645645
$this->model->getQuote()->setCustomer($customerMock);
646646
$order = $this->model->createOrder();
647+
if ($this->model->getSendConfirmation() && !$order->getEmailSent()) {
648+
$this->emailSenderMock->expects($this->once())
649+
->method('send')
650+
->willReturn(true);
651+
} else {
652+
$this->emailSenderMock->expects($this->never())->method('send');
653+
}
647654
$this->verifyCreatedOrder($order, $shippingMethod);
648655
}
649656

@@ -826,13 +833,6 @@ private function verifyCreatedOrder($order, $shippingMethod)
826833
{
827834
/** Selectively check order data */
828835
$orderData = $order->getData();
829-
if ($this->model->getSendConfirmation() && !$order->getEmailSent()) {
830-
$this->emailSenderMock->expects($this->once())
831-
->method('send')
832-
->willReturn(true);
833-
} else {
834-
$this->emailSenderMock->expects($this->never())->method('send');
835-
}
836836
self::assertNotEmpty($orderData['increment_id'], 'Order increment ID is empty.');
837837
self::assertEquals($this->model->getQuote()->getId(), $orderData['quote_id'], 'Quote ID is invalid.');
838838
self::assertEquals(

0 commit comments

Comments
 (0)