MDVA-275: Emails from admin being sent out using default config’s email, not the specific store email

Author: isitnikov

app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php

@@ -166,6 +166,16 @@ public function testSendPaymentFailedEmail()
             $this->returnSelf()
         );
 
+        $this->_transportBuilder->expects(
+            $this->once()
+        )->method(
+            'setScopeId'
+        )->with(
+            8
+        )->will(
+            $this->returnSelf()
+        );
+
         $this->_transportBuilder->expects(
             $this->once()
         )->method(

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

@@ -650,6 +650,10 @@ public function testCreateAccountWithoutPassword()
         $this->transportBuilder->expects($this->once())
             ->method('setTemplateVars')
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($defaultStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -799,6 +803,10 @@ function ($string) {
         $this->transportBuilder->expects($this->once())
             ->method('setTemplateVars')
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($defaultStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -901,6 +909,10 @@ public function testSendPasswordReminderEmail()
             ->method('setTemplateVars')
             ->with(['customer' => $this->customerSecure, 'store' => $this->store])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($customerStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -1031,6 +1043,10 @@ protected function prepareEmailSend($email, $templateIdentifier, $sender, $store
             ->method('setTemplateVars')
             ->with(['customer' => $this->customerSecure, 'store' => $this->store])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('setScopeId')
+            ->with($storeId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->any())
             ->method('setFrom')
             ->with($sender)

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

@@ -215,6 +215,7 @@ public function testSendNewAccountEmailWithoutStoreId()
             'setTemplateIdentifier',
             'setTemplateOptions',
             'setTemplateVars',
+            'setScopeId',
             'setFrom',
             'addTo',
         ];

app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php

@@ -662,6 +662,10 @@ public function testExecute()
                 'store' => $this->store,
             ])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($storeId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($from)