Update unit tests for ZF 2 mail

Author: schmengler

lib/internal/Magento/Framework/Mail/Message.php

@@ -10,14 +10,22 @@
 use Zend\Mime\Mime;
 use Zend\Mime\Part;
 
+/**
+ * @todo composition instead of inheritance for better testability
+ * - add a ZendMailDecorator interface with getZendMail() method for usage in \Magento\Framework\Mail\Transport
+ * @todo get rid of temporal coupling (setMessageType() + setBody())
+ * - deprecate setMessageType(), implement a HtmlMessage decorator instead
+ * - change usage in \Magento\Framework\Mail\Template\TransportBuilder::prepareMessage()
+ */
 class Message extends \Zend\Mail\Message implements MessageInterface
 {
+
     /**
      * @param string $charset
      */
     public function __construct($charset = 'utf-8')
     {
-        parent::setEncoding($charset);
+        $this->encoding = $charset;
     }
 
     /**
@@ -27,16 +35,6 @@ public function __construct($charset = 'utf-8')
      */
     protected $messageType = self::TYPE_TEXT;
 
-    private function htmlMimeFromString($htmlBody)
-    {
-        $htmlPart = new Part($htmlBody);
-        $htmlPart->setCharset($this->getEncoding());
-        $htmlPart->setType(Mime::TYPE_HTML);
-        $mimeMessage = new \Zend\Mime\Message();
-        $mimeMessage->addPart($htmlPart);
-        return $mimeMessage;
-    }
-
     /**
      * Set message type
      *
@@ -61,4 +59,17 @@ public function setBody($body)
         return parent::setBody($body);
     }
 
+    /**
+     * @param string $htmlBody
+     * @return \Zend\Mime\Message
+     */
+    private function htmlMimeFromString($htmlBody)
+    {
+        $htmlPart = new Part($htmlBody);
+        $htmlPart->setCharset($this->getEncoding());
+        $htmlPart->setType(Mime::TYPE_HTML);
+        $mimeMessage = new \Zend\Mime\Message();
+        $mimeMessage->addPart($htmlPart);
+        return $mimeMessage;
+    }
 }

lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php

@@ -14,6 +14,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $this->markTestSkipped('obsolete ZF 1 test');
         $this->_messageMock = $this->getMock(
             \Magento\Framework\Mail\Message::class,
             ['getBodyText', 'getBodyHtml', 'setBodyText', 'setBodyHtml']

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

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Mail\MessageInterface;
+use Zend\Mail\Headers;
 
 class TransportBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -53,6 +54,7 @@ protected function setUp()
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFactoryMock = $this->getMock(\Magento\Framework\Mail\Template\FactoryInterface::class);
         $this->messageMock = $this->getMock(\Magento\Framework\Mail\Message::class);
+        $this->messageMock->method('getHeaders')->willReturn(new Headers());
         $this->objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->senderResolverMock = $this->getMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
         $this->mailTransportFactoryMock = $this->getMockBuilder(

lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php

@@ -5,45 +5,32 @@
  */
 namespace Magento\Framework\Mail\Test\Unit;
 
+use Zend\Mail\Headers;
+
 class TransportTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject
-     */
-    protected $_messageMock;
-
-    /**
-     * @var \Magento\Framework\Mail\Transport
-     */
-    protected $_transport;
-
-    protected function setUp()
-    {
-        $this->_messageMock = $this->getMock(\Magento\Framework\Mail\Message::class, [], [], '', false);
-        $this->_transport = new \Magento\Framework\Mail\Transport($this->_messageMock);
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The message should be an instance of \Zend\Mail\Message
      */
     public function testTransportWithIncorrectMessageObject()
     {
-        $this->_messageMock = $this->getMock(\Magento\Framework\Mail\MessageInterface::class);
-        $this->_transport = new \Magento\Framework\Mail\Transport($this->_messageMock);
+        new \Magento\Framework\Mail\Transport(
+            $this->getMock(\Magento\Framework\Mail\MessageInterface::class)
+        );
     }
 
     /**
      * @covers \Magento\Framework\Mail\Transport::sendMessage
      * @expectedException \Magento\Framework\Exception\MailException
-     * @expectedExceptionMessage No body specified
+     * @expectedExceptionMessage Invalid email; contains no "To" header
      */
     public function testSendMessageBrokenMessage()
     {
-        $this->_messageMock->expects($this->any())
-            ->method('getParts')
-            ->will($this->returnValue(['a', 'b']));
+        $transport = new \Magento\Framework\Mail\Transport(
+            new \Magento\Framework\Mail\Message()
+        );
 
-        $this->_transport->sendMessage();
+        $transport->sendMessage();
     }
 }