MAGETWO-57656: Base url should be processed while sending email

Author: Karpenko, Oleksandr

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

@@ -5,7 +5,9 @@
  */
 namespace Magento\Email\Model\Template;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
 
@@ -159,6 +161,11 @@ class Filter extends \Magento\Framework\Filter\Template
      */
     private $cssProcessor;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
+     */
+    private $pubDirectory;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Psr\Log\LoggerInterface $logger
@@ -221,6 +228,18 @@ private function getCssProcessor()
         return $this->cssProcessor;
     }
 
+    /**
+     * @deprecated
+     * @return Filesystem\Directory\ReadInterface
+     */
+    private function getPubDirectory()
+    {
+        if (!$this->pubDirectory) {
+            $this->pubDirectory = ObjectManager::getInstance()->get(Filesystem::class)->getDirectoryRead(DirectoryList::STATIC_VIEW);
+        }
+        return $this->pubDirectory;
+    }
+
     /**
      * Set use absolute links flag
      *
@@ -909,7 +928,12 @@ public function getCssFilesContent(array $files)
         try {
             foreach ($files as $file) {
                 $asset = $this->_assetRepo->createAsset($file, $designParams);
-                $css .= $asset->getContent();
+                $filePath = $asset->getContext()->getPath() . '/' . $file;
+                if ($this->getPubDirectory()->isExist($filePath)) {
+                    $css .= $this->getPubDirectory()->readFile($filePath);
+                } else {
+                    $css .= $asset->getContent();
+                }
             }
         } catch (ContentProcessorException $exception) {
             $css = $exception->getMessage();

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

@@ -6,6 +6,8 @@
 namespace Magento\Email\Test\Unit\Model\Template;
 use Magento\Email\Model\Template\Css\Processor;
 use Magento\Email\Model\Template\Filter;
+use Magento\Framework\App\Area;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -269,7 +271,7 @@ public function testApplyInlineCss($html, $css, $expectedResults)
             ->will($this->returnValue($css));
 
         $designParams = [
-            'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+            'area' => Area::AREA_FRONTEND,
             'theme' => 'themeId',
             'locale' => 'localeId',
         ];
@@ -280,6 +282,56 @@ public function testApplyInlineCss($html, $css, $expectedResults)
         }
     }
 
+    public function testGetCssFilesContent()
+    {
+        $file = 'css/email.css';
+        $path = Area::AREA_FRONTEND . '/themeId/localeId';
+        $css = 'p{color:black}';
+        $designParams = [
+            'area' => Area::AREA_FRONTEND,
+            'theme' => 'themeId',
+            'locale' => 'localeId',
+        ];
+
+        $filter = $this->getModel();
+
+        $asset = $this->getMockBuilder(\Magento\Framework\View\Asset\File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fallbackContext = $this->getMockBuilder(\Magento\Framework\View\Asset\File\FallbackContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $fallbackContext->expects($this->once())
+            ->method('getPath')
+            ->willReturn($path);
+        $asset->expects($this->atLeastOnce())
+            ->method('getContext')
+            ->willReturn($fallbackContext);
+        $this->assetRepo->expects($this->once())
+            ->method('createAsset')
+            ->with($file, $designParams)
+            ->willReturn($asset);
+
+        $pubDirectory = $this->getMockBuilder(ReadInterface::class)
+            ->getMockForAbstractClass();
+        $reflectionClass = new \ReflectionClass(Filter::class);
+        $reflectionProperty = $reflectionClass->getProperty('pubDirectory');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($filter, $pubDirectory);
+        $pubDirectory->expects($this->once())
+            ->method('isExist')
+            ->with($path . '/' . $file)
+            ->willReturn(true);
+        $pubDirectory->expects($this->once())
+            ->method('readFile')
+            ->with($path . '/' . $file)
+            ->willReturn($css);
+
+        $filter->setDesignParams($designParams);
+
+        $this->assertEquals($css, $filter->getCssFilesContent([$file]));
+    }
+
     /**
      * @return array
      */

lib/internal/Magento/Framework/View/Asset/NotationResolver/Variable.php

@@ -70,7 +70,7 @@ public function getPlaceholderValue($placeholder)
 
         switch ($placeholder) {
             case self::VAR_BASE_URL_PATH:
-                return '{{' . self::VAR_BASE_URL_PATH . '}}/' . $context->getAreaCode() .
+                return '{{' . self::VAR_BASE_URL_PATH . '}}' . $context->getAreaCode() .
                     ($context->getThemePath() ? '/' . $context->getThemePath() . '/' : '') .
                     '{{locale}}';
             default:

lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php

@@ -69,7 +69,7 @@ public function testConvertVariableNotation($path, $expectedResult)
     public function convertVariableNotationDataProvider()
     {
         return [
-            ['{{base_url_path}}/file.ext', '{{base_url_path}}/frontend/Magento/blank/{{locale}}/file.ext'],
+            ['{{base_url_path}}/file.ext', '{{base_url_path}}frontend/Magento/blank/{{locale}}/file.ext'],
         ];
     }
 }