Merge remote-tracking branch 'remotes/Tango-CE/MAGETWO-44045' into MAGETWO-44772_pr_bugs

Author: Oleh Posyniak

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

@@ -103,7 +103,7 @@ public function testGetTransport(
 
         $transport = $this->getMock('\Magento\Framework\Mail\TransportInterface');
 
-        $this->_mailTransportFactoryMock->expects(
+        $this->mailTransportFactoryMock->expects(
             $this->at(0)
         )->method(
             'create'

app/code/Magento/User/Model/User.php

@@ -369,6 +369,7 @@ public function sendPasswordResetConfirmationEmail()
     {
         $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
         $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+            ->setTemplateModel('Magento\Email\Model\BackendTemplate')
             ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
             ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
             ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
@@ -388,6 +389,7 @@ public function sendPasswordResetNotificationEmail()
     {
         $templateId = $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE);
         $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+            ->setTemplateModel('Magento\Email\Model\BackendTemplate')
             ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
             ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
             ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))