MC-37493: Create automated test for "Create Invoice for Offline Payment Methods with Async Notification"

Author: romadjelf

dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php

@@ -12,7 +12,6 @@
 use Magento\Sales\Api\Data\InvoiceSearchResultInterface;
 use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
-use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Spi\InvoiceResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
@@ -87,23 +86,27 @@ public function testInvoiceEmailSenderExecute(): void
 
     /**
      * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Sales/_files/invoice_in_email_send_queue.php
+     * @magentoDataFixture Magento/Sales/_files/invoice_with_send_email_flag.php
      * @magentoConfigFixture default/sales_email/general/async_sending 1
      * @return void
      */
     public function testSendEmailsCheckEmailReceived(): void
     {
         $invoiceCollection = clone $this->entityCollection;
         $this->emailSenderHandler->sendEmails();
-        /** @var Invoice $invoice */
+        /** @var InvoiceInterface $invoice */
         $invoice = $invoiceCollection->getFirstItem();
         $this->assertNotNull($invoice->getId());
         $message = $this->transportBuilderMock->getSentMessage();
         $this->assertNotNull($message, 'The message is expected to be received');
         $subject = __('Invoice for your %1 order', $invoice->getStore()->getFrontendName())->render();
         $this->assertEquals($message->getSubject(), $subject);
         $this->assertStringContainsString(
-            "Your Invoice #{$invoice->getIncrementId()} for Order #{$invoice->getOrder()->getIncrementId()}",
+            sprintf(
+                "Your Invoice #%s for Order #%s",
+                $invoice->getIncrementId(),
+                $invoice->getOrder()->getIncrementId()
+            ),
             $message->getBody()->getParts()[0]->getRawContent()
         );
     }

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php

@@ -8,13 +8,11 @@
 namespace Magento\Sales\Model\Order\Email\Sender;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\ResourceModel\CustomerRepository;
-use Magento\Framework\App\Area;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\InvoiceInterfaceFactory;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderInterfaceFactory;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -36,7 +34,7 @@ class InvoiceSenderTest extends TestCase
     /** @var ObjectManagerInterface */
     private $objectManager;
 
-    /** @var CustomerRepository */
+    /** @var CustomerRepositoryInterface */
     private $customerRepository;
 
     /** @var InvoiceSender */
@@ -71,11 +69,11 @@ protected function setUp(): void
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoAppArea frontend
      * @return void
      */
     public function testSend(): void
     {
-        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
         $order = $this->getOrder('100000001');
         $order->setCustomerEmail('customer@example.com');
         $invoice = $this->createInvoice($order);
@@ -183,10 +181,10 @@ public function testSendWithAsyncSendingEnabled(): void
     /**
      * Create invoice and set order
      *
-     * @param Order $order
-     * @return Invoice
+     * @param OrderInterface $order
+     * @return InvoiceInterface
      */
-    private function createInvoice(Order $order): Invoice
+    private function createInvoice(OrderInterface $order): InvoiceInterface
     {
         /** @var Invoice $invoice */
         $invoice = $this->invoiceFactory->create();
@@ -199,9 +197,9 @@ private function createInvoice(Order $order): Invoice
      * Get order by increment_id
      *
      * @param string $incrementId
-     * @return Order
+     * @return OrderInterface
      */
-    private function getOrder(string $incrementId): Order
+    private function getOrder(string $incrementId): OrderInterface
     {
         return $this->orderFactory->create()->loadByIncrementId($incrementId);
     }

dev/tests/integration/testsuite/Magento/Sales/_files/invoice_in_email_send_queue.php renamed to dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_send_email_flag.php

@@ -13,7 +13,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order.php');
 
 $objectManager = Bootstrap::getObjectManager();
@@ -29,6 +28,5 @@
 $invoice = $invoiceService->prepareInvoice($order);
 $invoice->register();
 $invoice->setSendEmail(true);
-//$order = $invoice->getOrder();
 $order->setIsInProcess(true);
 $transactionSave->addObject($invoice)->addObject($order)->save();

dev/tests/integration/testsuite/Magento/Sales/_files/invoice_in_email_send_queue_rollback.php renamed to dev/tests/integration/testsuite/Magento/Sales/_files/invoice_with_send_email_flag_rollback.php

@@ -7,4 +7,4 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_rollback.php');