Merge remote-tracking branch 'remotes/github/MC-10938' into EPAM-PR-40

Author: VeronikaYarats

app/code/Magento/Translation/Model/Json/PreProcessor.php

@@ -6,13 +6,15 @@
 
 namespace Magento\Translation\Model\Json;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\TranslateInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\PreProcessor\Chain;
 use Magento\Framework\View\Asset\PreProcessorInterface;
 use Magento\Framework\View\DesignInterface;
+use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Translation\Model\Js\Config;
 use Magento\Translation\Model\Js\DataProviderInterface;
 
@@ -83,7 +85,7 @@ public function process(Chain $chain)
             $context = $chain->getAsset()->getContext();
 
             $themePath = '*/*';
-            $areaCode = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
+            $areaCode = FrontNameResolver::AREA_CODE;
 
             if ($context instanceof FallbackContext) {
                 $themePath = $context->getThemePath();
@@ -92,8 +94,10 @@ public function process(Chain $chain)
                 $this->viewDesign->setDesignTheme($themePath, $areaCode);
             }
 
-            $area = $this->areaList->getArea($areaCode);
-            $area->load(\Magento\Framework\App\Area::PART_TRANSLATE);
+            if ($areaCode !== FrontNameResolver::AREA_CODE) {
+                $area = $this->areaList->getArea($areaCode);
+                $area->load(Area::PART_TRANSLATE);
+            }
 
             $this->translate->setLocale($context->getLocale())->loadData($areaCode, true);
 

app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php

@@ -8,39 +8,43 @@
 use Magento\Translation\Model\Js\Config;
 use Magento\Translation\Model\Js\DataProvider;
 use Magento\Translation\Model\Json\PreProcessor;
+use Magento\Backend\App\Area\FrontNameResolver;
 
 class PreProcessorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var PreProcessor
      */
-    protected $model;
+    private $model;
 
     /**
      * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $configMock;
+    private $configMock;
 
     /**
      * @var DataProvider|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $dataProviderMock;
+    private $dataProviderMock;
 
     /**
      * @var \Magento\Framework\App\AreaList|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $areaListMock;
+    private $areaListMock;
 
     /**
      * @var \Magento\Framework\TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $translateMock;
+    private $translateMock;
 
     /**
      * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $designMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->configMock = $this->createMock(\Magento\Translation\Model\Js\Config::class);
@@ -57,7 +61,14 @@ protected function setUp()
         );
     }
 
-    public function testGetData()
+    /**
+     * Test 'process' method.
+     *
+     * @param array $data
+     * @param array $expects
+     * @dataProvider processDataProvider
+     */
+    public function testProcess(array $data, array $expects)
     {
         $chain = $this->createMock(\Magento\Framework\View\Asset\PreProcessor\Chain::class);
         $asset = $this->createMock(\Magento\Framework\View\Asset\File::class);
@@ -66,8 +77,10 @@ public function testGetData()
         $targetPath = 'path/js-translation.json';
         $themePath = '*/*';
         $dictionary = ['hello' => 'bonjour'];
-        $areaCode = 'adminhtml';
+        $areaCode = $data['area_code'];
+
         $area = $this->createMock(\Magento\Framework\App\Area::class);
+        $area->expects($expects['area_load'])->method('load')->willReturnSelf();
 
         $chain->expects($this->once())
             ->method('getTargetAssetPath')
@@ -93,7 +106,7 @@ public function testGetData()
 
         $this->designMock->expects($this->once())->method('setDesignTheme')->with($themePath, $areaCode);
 
-        $this->areaListMock->expects($this->once())
+        $this->areaListMock->expects($expects['areaList_getArea'])
             ->method('getArea')
             ->with($areaCode)
             ->willReturn($area);
@@ -114,4 +127,33 @@ public function testGetData()
 
         $this->model->process($chain);
     }
+
+    /**
+     * Data provider for 'process' method test.
+     *
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            [
+                [
+                    'area_code' => FrontNameResolver::AREA_CODE
+                ],
+                [
+                    'areaList_getArea' => $this->never(),
+                    'area_load' => $this->never(),
+                ]
+            ],
+            [
+                [
+                    'area_code' => 'frontend'
+                ],
+                [
+                    'areaList_getArea' => $this->once(),
+                    'area_load' => $this->once(),
+                ]
+            ],
+        ];
+    }
 }