MAGETWO-44045: Reset password page not displayed, instead user login page displayed.

Author: Bohdan Korablov

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,7 +369,7 @@ public function sendPasswordResetConfirmationEmail()
     {
         $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
         $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
-            ->setTemplateNamespace('Magento\Email\Model\BackendTemplate')
+            ->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))
@@ -389,7 +389,7 @@ public function sendPasswordResetNotificationEmail()
     {
         $templateId = $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE);
         $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
-            ->setTemplateNamespace('Magento\Email\Model\BackendTemplate')
+            ->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))

app/code/Magento/User/Test/Unit/Model/UserTest.php

@@ -171,7 +171,7 @@ public function testSendPasswordResetNotificationEmail()
             ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY)
             ->willReturn('sender');
         $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateNamespace')
+            ->method('setTemplateModel')
             ->with($this->equalTo('Magento\Email\Model\BackendTemplate'))
             ->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())
@@ -229,7 +229,7 @@ public function testSendPasswordResetConfirmationEmail()
             ->with(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_IDENTITY)
             ->willReturn('sender');
         $this->transportBuilderMock->expects($this->once())
-            ->method('setTemplateNamespace')
+            ->method('setTemplateModel')
             ->with($this->equalTo('Magento\Email\Model\BackendTemplate'))
             ->willReturnSelf();
         $this->transportBuilderMock->expects($this->once())

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

@@ -24,11 +24,11 @@ class TransportBuilder
     protected $templateIdentifier;
 
     /**
-     * Template Namespace
+     * Template Model
      *
      * @var string
      */
-    protected $templateNamespace;
+    protected $templateModel;
 
     /**
      * Template Variables
@@ -182,14 +182,14 @@ public function setTemplateIdentifier($templateIdentifier)
     }
 
     /**
-     * Set template namespace
+     * Set template model
      *
-     * @param string $templateNamespace
+     * @param string $templateModel
      * @return $this
      */
-    public function setTemplateNamespace($templateNamespace)
+    public function setTemplateModel($templateModel)
     {
-        $this->templateNamespace = $templateNamespace;
+        $this->templateModel = $templateModel;
         return $this;
     }
 
@@ -252,7 +252,7 @@ protected function reset()
      */
     protected function getTemplate()
     {
-        return $this->templateFactory->get($this->templateIdentifier, $this->templateNamespace)
+        return $this->templateFactory->get($this->templateIdentifier, $this->templateModel)
             ->setVars($this->templateVars)
             ->setOptions($this->templateOptions);
     }

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

@@ -81,7 +81,7 @@ public function setUp()
      */
     public function testGetTransport($templateType, $messageType, $bodyText, $templateNamespace)
     {
-        $this->builder->setTemplateNamespace($templateNamespace);
+        $this->builder->setTemplateModel($templateNamespace);
 
         $vars = ['reason' => 'Reason', 'customer' => 'Customer'];
         $options = ['area' => 'frontend', 'store' => 1];