Merge remote-tracking branch 'jackalopes/MAGETWO-70738-mail-transport' into Okapis-PR

Author: cpartica

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Stub/TransportInterfaceMock.php

@@ -18,4 +18,14 @@ public function sendMessage()
     {
         return;
     }
+
+    /**
+     * Get message
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return '';
+    }
 }

dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php

@@ -17,4 +17,14 @@ public function sendMessage()
     {
         return;
     }
+
+    /**
+     * Get message
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return '';
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php

@@ -762,8 +762,7 @@ protected function prepareEmailMock($occurrenceNumber, $templateId, $sender, $cu
         $storeId = $customer->getStoreId();
         $name = $this->customerViewHelper->getCustomerName($customer);
         $transportMock = $this->getMock(
-            \Magento\Framework\Mail\TransportInterface::class,
-            ['sendMessage']
+            \Magento\Framework\Mail\TransportInterface::class
         );
         $transportMock->expects($this->exactly($occurrenceNumber))
             ->method('sendMessage');

dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php

@@ -268,8 +268,7 @@ public function testResetPasswordPostActionWithInvalidPassword()
     protected function prepareEmailMock($occurrenceNumber, $templateId, $sender)
     {
         $transportMock = $this->getMock(
-            \Magento\Framework\Mail\TransportInterface::class,
-            ['sendMessage']
+            \Magento\Framework\Mail\TransportInterface::class
         );
         $transportMock->expects($this->exactly($occurrenceNumber))
             ->method('sendMessage');

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

@@ -10,17 +10,17 @@ class TransportTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject
      */
-    protected $_messageMock;
+    protected $messageMock;
 
     /**
      * @var \Magento\Framework\Mail\Transport
      */
-    protected $_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);
+        $this->messageMock = $this->getMock(\Magento\Framework\Mail\Message::class, [], [], '', false);
+        $this->transport = new \Magento\Framework\Mail\Transport($this->messageMock);
     }
 
     /**
@@ -29,8 +29,8 @@ protected function setUp()
      */
     public function testTransportWithIncorrectMessageObject()
     {
-        $this->_messageMock = $this->getMock(\Magento\Framework\Mail\MessageInterface::class);
-        $this->_transport = new \Magento\Framework\Mail\Transport($this->_messageMock);
+        $this->messageMock = $this->getMock(\Magento\Framework\Mail\MessageInterface::class);
+        $this->transport = new \Magento\Framework\Mail\Transport($this->messageMock);
     }
 
     /**
@@ -40,10 +40,15 @@ public function testTransportWithIncorrectMessageObject()
      */
     public function testSendMessageBrokenMessage()
     {
-        $this->_messageMock->expects($this->any())
+        $this->messageMock->expects($this->any())
             ->method('getParts')
             ->will($this->returnValue(['a', 'b']));
 
-        $this->_transport->sendMessage();
+        $this->transport->sendMessage();
+    }
+
+    public function testGetMessage()
+    {
+        $this->assertSame($this->messageMock, $this->transport->getMessage());
     }
 }

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

@@ -41,4 +41,14 @@ public function sendMessage()
             throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
         }
     }
+
+    /**
+     * Get message
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->_message;
+    }
 }

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

@@ -19,4 +19,11 @@ interface TransportInterface
      * @throws \Magento\Framework\Exception\MailException
      */
     public function sendMessage();
+
+    /**
+     * Get message
+     *
+     * @return string
+     */
+    public function getMessage();
 }