Merge remote-tracking branch 'origin/MC-18193' into 2.3-develop-pr28

Author: serhii-balko

lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php

@@ -261,9 +261,12 @@ public function setTemplateOptions($templateOptions)
      */
     public function getTransport()
     {
-        $this->prepareMessage();
-        $mailTransport = $this->mailTransportFactory->create(['message' => clone $this->message]);
-        $this->reset();
+        try {
+            $this->prepareMessage();
+            $mailTransport = $this->mailTransportFactory->create(['message' => clone $this->message]);
+        } finally {
+            $this->reset();
+        }
 
         return $mailTransport;
     }

lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php

@@ -143,6 +143,34 @@ public function testGetTransport($templateType, $messageType, $bodyText, $templa
         $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $this->builder->getTransport());
     }
 
+    /**
+     * Test get transport with exception
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Unknown template type
+     */
+    public function testGetTransportWithException()
+    {
+        $this->builder->setTemplateModel('Test\Namespace\Template');
+
+        $vars = ['reason' => 'Reason', 'customer' => 'Customer'];
+        $options = ['area' => 'frontend', 'store' => 1];
+
+        $template = $this->createMock(\Magento\Framework\Mail\TemplateInterface::class);
+        $template->expects($this->once())->method('setVars')->with($this->equalTo($vars))->willReturnSelf();
+        $template->expects($this->once())->method('setOptions')->with($this->equalTo($options))->willReturnSelf();
+        $template->expects($this->once())->method('getType')->willReturn('Unknown');
+        $this->messageFactoryMock->expects($this->once())->method('create');
+        $this->templateFactoryMock->expects($this->once())
+            ->method('get')
+            ->with($this->equalTo('identifier'), $this->equalTo('Test\Namespace\Template'))
+            ->willReturn($template);
+
+        $this->builder->setTemplateIdentifier('identifier')->setTemplateVars($vars)->setTemplateOptions($options);
+
+        $this->assertInstanceOf(\Magento\Framework\Mail\TransportInterface::class, $this->builder->getTransport());
+    }
+
     /**
      * @return array
      */