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

Author: Bohdan Korablov

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)
+            ->setTemplateNamespace('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)
+            ->setTemplateNamespace('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))

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

@@ -12,12 +12,12 @@ class Factory implements \Magento\Framework\Mail\Template\FactoryInterface
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $_objectManager = null;
+    protected $objectManager = null;
 
     /**
      * @var string
      */
-    protected $_instanceName = null;
+    protected $instanceName = null;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
@@ -27,17 +27,17 @@ public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
         $instanceName = 'Magento\Framework\Mail\TemplateInterface'
     ) {
-        $this->_objectManager = $objectManager;
-        $this->_instanceName = $instanceName;
+        $this->objectManager = $objectManager;
+        $this->instanceName = $instanceName;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function get($identifier)
+    public function get($identifier, $namespace = null)
     {
-        return $this->_objectManager->create(
-            $this->_instanceName,
+        return $this->objectManager->create(
+            $namespace ? $namespace : $this->instanceName,
             ['data' => ['template_id' => $identifier]]
         );
     }

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

@@ -16,7 +16,8 @@ interface FactoryInterface
      * Returns the mail template associated with the identifier.
      *
      * @param string $identifier
+     * @param null|string $namespace
      * @return \Magento\Framework\Mail\TemplateInterface
      */
-    public function get($identifier);
+    public function get($identifier, $namespace = null);
 }

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

@@ -23,6 +23,13 @@ class TransportBuilder
      */
     protected $templateIdentifier;
 
+    /**
+     * Template Namespace
+     *
+     * @var string
+     */
+    protected $templateNamespace;
+
     /**
      * Template Variables
      *
@@ -174,6 +181,18 @@ public function setTemplateIdentifier($templateIdentifier)
         return $this;
     }
 
+    /**
+     * Set template namespace
+     *
+     * @param string $templateNamespace
+     * @return $this
+     */
+    public function setTemplateNamespace($templateNamespace)
+    {
+        $this->templateNamespace = $templateNamespace;
+        return $this;
+    }
+
     /**
      * Set template vars
      *
@@ -233,7 +252,7 @@ protected function reset()
      */
     protected function getTemplate()
     {
-        return $this->templateFactory->get($this->templateIdentifier)
+        return $this->templateFactory->get($this->templateIdentifier, $this->templateNamespace)
             ->setVars($this->templateVars)
             ->setOptions($this->templateOptions);
     }

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

@@ -5,37 +5,70 @@
  */
 namespace Magento\Framework\Mail\Test\Unit\Template;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_objectManagerMock;
+    protected $templateMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject
+     * @var ObjectManagerHelper
      */
-    protected $_templateMock;
+    protected $objectManagerHelper;
 
+    /**
+     * @return void
+     */
     public function setUp()
     {
-        $this->_objectManagerMock = $this->getMock('\Magento\Framework\ObjectManagerInterface');
-        $this->_templateMock = $this->getMock('\Magento\Framework\Mail\TemplateInterface');
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->objectManagerMock = $this->getMock('\Magento\Framework\ObjectManagerInterface');
+        $this->templateMock = $this->getMock('\Magento\Framework\Mail\TemplateInterface');
     }
 
     /**
-     * @covers \Magento\Framework\Mail\Template\Factory::get
-     * @covers \Magento\Framework\Mail\Template\Factory::__construct
+     * @param string $expectedArgument
+     * @param null|string $namespace
+     * @return void
+     * @dataProvider getDataProvider
      */
-    public function testGet()
+    public function testGet($expectedArgument, $namespace)
     {
-        $model = new \Magento\Framework\Mail\Template\Factory($this->_objectManagerMock);
+        $factory = $this->objectManagerHelper->getObject(
+            'Magento\Framework\Mail\Template\Factory',
+            ['objectManager' => $this->objectManagerMock]
+        );
 
-        $this->_objectManagerMock->expects($this->once())
+        $this->objectManagerMock->expects($this->once())
             ->method('create')
-            ->with('Magento\Framework\Mail\TemplateInterface', ['data' => ['template_id' => 'identifier']])
-            ->will($this->returnValue($this->_templateMock));
+            ->with($expectedArgument, ['data' => ['template_id' => 'identifier']])
+            ->willReturn($this->templateMock);
 
-        $this->assertInstanceOf('\Magento\Framework\Mail\TemplateInterface', $model->get('identifier'));
+        $this->assertInstanceOf('\Magento\Framework\Mail\TemplateInterface', $factory->get('identifier', $namespace));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataProvider()
+    {
+        return [
+            [
+                'expectedArgument' => 'Magento\Framework\Mail\TemplateInterface',
+                'namespace' => null
+            ],
+            [
+                'expectedArgument' => 'Test\Namespace\Implements\TemplateInterface',
+                'namespace' => 'Test\Namespace\Implements\TemplateInterface'
+            ]
+        ];
     }
 }