ACP2E-1063: received duplicate emails after created an order from admin

Author: glo23503

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

@@ -54,8 +54,8 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->messageManager = $this->objectManager->get(ManagerInterface::class);
         $this->emailSenderMock = $this->getMockBuilder(EmailSender::class)
-        ->disableOriginalConstructor()
-        ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model =$this->objectManager->create(
             Create::class,
             ['messageManager' => $this->messageManager, 'emailSender' => $this->emailSenderMock]
@@ -612,11 +612,8 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @dataProvider emailCheckProvider
-     * @param bool $sendConfirmation
-     * @param bool $emailSent
      */
-    public function testCreateOrderExistingCustomer($sendConfirmation, $emailSent)
+    public function testCreateOrderExistingCustomer()
     {
         $productIdFromFixture = 1;
         $customerIdFromFixture = 1;
@@ -629,8 +626,7 @@ public function testCreateOrderExistingCustomer($sendConfirmation, $emailSent)
             'billing_address' => array_merge($this->getValidAddressData(), ['save_in_address_book' => '1']),
             'shipping_method' => $shippingMethod,
             'comment' => ['customer_note' => ''],
-            'send_confirmation' => $sendConfirmation,
-            'email_sent' => $emailSent,
+            'send_confirmation' => false,
         ];
         $paymentData = ['method' => $paymentMethod];
 
@@ -645,32 +641,12 @@ public function testCreateOrderExistingCustomer($sendConfirmation, $emailSent)
             $customerIdFromFixture
         );
         $customerMock = $this->getMockedCustomer();
-        if ($customerIdFromFixture && !$emailSent) {
-            $this->emailSenderMock->expects($this->once())
-                ->method('send')
-                ->willReturn(true);
-        } else {
-            $this->emailSenderMock->expects($this->never())->method('send');
-        }
 
         $this->model->getQuote()->setCustomer($customerMock);
         $order = $this->model->createOrder();
         $this->verifyCreatedOrder($order, $shippingMethod);
     }
 
-    /**
-     * Data provider for testApplySelectionOnTargetProvider.
-     *
-     * @return array
-     */
-    public function emailCheckProvider(): array
-    {
-        return [
-            [false, true],
-            [true, false]
-        ];
-    }
-
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -850,6 +826,13 @@ private function verifyCreatedOrder($order, $shippingMethod)
     {
         /** Selectively check order data */
         $orderData = $order->getData();
+        if (!$order->getEmailSent()) {
+            $this->emailSenderMock->expects($this->once())
+                ->method('send')
+                ->willReturn(true);
+        } else {
+            $this->emailSenderMock->expects($this->never())->method('send');
+        }
         self::assertNotEmpty($orderData['increment_id'], 'Order increment ID is empty.');
         self::assertEquals($this->model->getQuote()->getId(), $orderData['quote_id'], 'Quote ID is invalid.');
         self::assertEquals(