Merge branch 'MC-41588' of https://github.com/magento-l3/magento2ce into PR-20210423

Author: chittima

app/code/Magento/Customer/Model/EmailNotification.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\SenderResolverInterface;
+use Magento\Store\Model\App\Emulation;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Customer\Helper\View as CustomerViewHelper;
@@ -103,6 +104,11 @@ class EmailNotification implements EmailNotificationInterface
      */
     private $senderResolver;
 
+    /**
+     * @var Emulation
+     */
+    private $emulation;
+
     /**
      * @param CustomerRegistry $customerRegistry
      * @param StoreManagerInterface $storeManager
@@ -111,6 +117,7 @@ class EmailNotification implements EmailNotificationInterface
      * @param DataObjectProcessor $dataProcessor
      * @param ScopeConfigInterface $scopeConfig
      * @param SenderResolverInterface|null $senderResolver
+     * @param Emulation|null $emulation
      */
     public function __construct(
         CustomerRegistry $customerRegistry,
@@ -119,7 +126,8 @@ public function __construct(
         CustomerViewHelper $customerViewHelper,
         DataObjectProcessor $dataProcessor,
         ScopeConfigInterface $scopeConfig,
-        SenderResolverInterface $senderResolver = null
+        SenderResolverInterface $senderResolver = null,
+        Emulation $emulation =null
     ) {
         $this->customerRegistry = $customerRegistry;
         $this->storeManager = $storeManager;
@@ -128,6 +136,7 @@ public function __construct(
         $this->dataProcessor = $dataProcessor;
         $this->scopeConfig = $scopeConfig;
         $this->senderResolver = $senderResolver ?? ObjectManager::getInstance()->get(SenderResolverInterface::class);
+        $this->emulation = $emulation ?? ObjectManager::getInstance()->get(Emulation::class);
     }
 
     /**
@@ -274,7 +283,9 @@ private function sendEmailTemplate(
             ->addTo($email, $this->customerViewHelper->getCustomerName($customer))
             ->getTransport();
 
+        $this->emulation->startEnvironmentEmulation($storeId, \Magento\Framework\App\Area::AREA_FRONTEND);
         $transport->sendMessage();
+        $this->emulation->stopEnvironmentEmulation();
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\App\Emulation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
@@ -113,6 +114,10 @@ class EmailNotificationTest extends TestCase
      * @var SenderResolverInterface|MockObject
      */
     private $senderResolverMock;
+    /**
+     * @var Emulation|MockObject
+     */
+    private $emulation;
 
     /**
      * @inheritdoc
@@ -144,6 +149,7 @@ protected function setUp(): void
             ->setMethods(['resolve'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->emulation = $this->createMock(Emulation::class);
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -157,6 +163,7 @@ protected function setUp(): void
                 'dataProcessor' => $this->dataProcessorMock,
                 'scopeConfig' => $this->scopeConfigMock,
                 'senderResolver' => $this->senderResolverMock,
+                'emulation' => $this->emulation,
             ]
         );
     }
@@ -336,6 +343,14 @@ public function testEmailNotifyWhenCredentialsChanged(
         $transport->expects(clone $expects)
             ->method('sendMessage');
 
+        $this->emulation->expects(clone $expects)
+            ->method('startEnvironmentEmulation')
+            ->willReturnSelf();
+
+        $this->emulation->expects(clone $expects)
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
+
         $this->model->credentialsChanged($savedCustomer, $oldEmail, $isPasswordChanged);
     }
 
@@ -498,6 +513,14 @@ public function testPasswordReminder($customerStoreId):void
             ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
         );
 
+        $this->emulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->willReturnSelf();
+
+        $this->emulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
+
         $this->model->passwordReminder($customerMock);
     }
 
@@ -595,6 +618,14 @@ public function testPasswordReminderCustomerWithoutStoreId():void
             self::STUB_CUSTOMER_NAME,
             ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
         );
+        $this->emulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->willReturnSelf();
+
+        $this->emulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
+
         $this->model->passwordReminder($customer);
     }
 
@@ -690,6 +721,13 @@ public function testPasswordResetConfirmation($customerStoreId):void
             self::STUB_CUSTOMER_NAME,
             ['customer' => $this->customerSecureMock, 'store' => $this->storeMock]
         );
+        $this->emulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->willReturnSelf();
+
+        $this->emulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
 
         $this->model->passwordResetConfirmation($customerMock);
     }
@@ -785,6 +823,13 @@ public function testNewAccount($customerStoreId):void
             self::STUB_CUSTOMER_NAME,
             ['customer' => $this->customerSecureMock, 'back_url' => '', 'store' => $this->storeMock]
         );
+        $this->emulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->willReturnSelf();
+
+        $this->emulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
 
         $this->model->newAccount(
             $customer,