Skip to content

Commit d449f67

Browse files
author
Karpenko, Oleksandr
committed
MAGETWO-57656: Base url should be processed while sending email
1 parent dd7106b commit d449f67

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

app/code/Magento/Email/Model/Template/Filter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,8 @@ public function getCssFilesContent(array $files)
930930
foreach ($files as $file) {
931931
$asset = $this->_assetRepo->createAsset($file, $designParams);
932932
$pubDirectory = $this->getPubDirectory($asset->getContext()->getBaseDirType());
933-
if ($pubDirectory->isExist($asset->getRelativeSourceFilePath())) {
934-
$css .= $pubDirectory->readFile($asset->getRelativeSourceFilePath());
933+
if ($pubDirectory->isExist($asset->getPath())) {
934+
$css .= $pubDirectory->readFile($asset->getPath());
935935
} else {
936936
$css .= $asset->getContent();
937937
}

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
use Magento\Email\Model\Template\Css\Processor;
88
use Magento\Email\Model\Template\Filter;
99
use Magento\Framework\App\Area;
10+
use Magento\Framework\App\Filesystem\DirectoryList;
1011
use Magento\Framework\Filesystem\Directory\ReadInterface;
12+
use Magento\Framework\View\Asset\File\FallbackContext;
1113

1214
/**
1315
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -292,21 +294,25 @@ public function testGetCssFilesContent()
292294
'theme' => 'themeId',
293295
'locale' => 'localeId',
294296
];
295-
296297
$filter = $this->getModel();
297298

298299
$asset = $this->getMockBuilder(\Magento\Framework\View\Asset\File::class)
299300
->disableOriginalConstructor()
300301
->getMock();
301-
$fallbackContext = $this->getMockBuilder(\Magento\Framework\View\Asset\File\FallbackContext::class)
302+
303+
$fallbackContext = $this->getMockBuilder(FallbackContext::class)
302304
->disableOriginalConstructor()
303305
->getMock();
304306
$fallbackContext->expects($this->once())
305-
->method('getPath')
306-
->willReturn($path);
307+
->method('getBaseDirType')
308+
->willReturn(DirectoryList::STATIC_VIEW);
307309
$asset->expects($this->atLeastOnce())
308310
->method('getContext')
309311
->willReturn($fallbackContext);
312+
313+
$asset->expects($this->atLeastOnce())
314+
->method('getPath')
315+
->willReturn($path . DIRECTORY_SEPARATOR . $file);
310316
$this->assetRepo->expects($this->once())
311317
->method('createAsset')
312318
->with($file, $designParams)

0 commit comments

Comments
 (0)