MAGETWO-67680: Replace Zend_Mail (ZF1) with Zend\Mail (ZF2) #8608

 - fixed unit tests

Author: Oleksii Korshenko

app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php

@@ -6,7 +6,6 @@
 namespace Magento\Newsletter\Model\Queue;
 
 use Magento\Email\Model\AbstractTemplate;
-use Magento\Framework\Exception\LocalizedException;
 
 class TransportBuilder extends \Magento\Framework\Mail\Template\TransportBuilder
 {
@@ -49,24 +48,11 @@ protected function prepareMessage()
         $template = $this->getTemplate()->setData($this->templateData);
         $this->setTemplateFilter($template);
 
-        $body = $template->getProcessedTemplate($this->templateVars);
-        switch ($template->getType()) {
-            case \Magento\Framework\Mail\MessageInterface::TYPE_TEXT:
-                $this->message->setBodyText($body);
-                break;
-
-            case \Magento\Framework\Mail\MessageInterface::TYPE_HTML:
-                $this->message->setBodyHtml($body);
-                break;
-
-            default;
-                throw new LocalizedException(
-                    __('Unknown template type')
-                );
-                break;
-        }
-
-        $this->message->setSubject($template->getSubject());
+        $this->message->setBodyHtml(
+            $template->getProcessedTemplate($this->templateVars)
+        )->setSubject(
+            $template->getSubject()
+        );
 
         return $this;
     }

app/code/Magento/Newsletter/Test/Unit/Model/Queue/TransportBuilderTest.php

@@ -137,16 +137,7 @@ public function testGetTransport(
         $this->messageMock->expects(
             $this->once()
         )->method(
-            'setMessageType'
-        )->with(
-            $this->equalTo($messageType)
-        )->will(
-            $this->returnSelf()
-        );
-        $this->messageMock->expects(
-            $this->once()
-        )->method(
-            'setBody'
+            'setBodyHtml'
         )->with(
             $this->equalTo($bodyText)
         )->will(

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

@@ -270,13 +270,12 @@ protected function prepareMessage()
     {
         $template = $this->getTemplate();
         $body = $template->processTemplate();
-
         switch ($template->getType()) {
-            case MessageInterface::TYPE_TEXT:
+            case TemplateTypesInterface::TYPE_TEXT:
                 $this->message->setBodyText($body);
                 break;
 
-            case MessageInterface::TYPE_HTML:
+            case TemplateTypesInterface::TYPE_HTML:
                 $this->message->setBodyHtml($body);
                 break;
 

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

@@ -103,12 +103,14 @@ public function testGetTransport($templateType, $messageType, $bodyText, $templa
             ->method('setSubject')
             ->with($this->equalTo('Email Subject'))
             ->willReturnSelf();
-        $this->messageMock->expects($this->once())
-            ->method('setMessageType')
-            ->with($this->equalTo($messageType))
+
+        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_TEXT)))
+            ->method('setBodyText')
+            ->with($this->equalTo($bodyText))
             ->willReturnSelf();
-        $this->messageMock->expects($this->once())
-            ->method('setBody')
+
+        $this->messageMock->expects($this->exactly(intval($messageType == MessageInterface::TYPE_HTML)))
+            ->method('setBodyHtml')
             ->with($this->equalTo($bodyText))
             ->willReturnSelf();