MAGETWO-44603: Styles are lost on Storefront if CSS files minification is enabled in "default" mode

- Fixed test

Author: Dell-

app/code/Magento/Deploy/Model/Deployer.php

@@ -300,6 +300,7 @@ protected function emulateApplicationLocale($locale, $area)
      * @throws LocalizedException
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function deployFile($filePath, $area, $themePath, $locale, $module)
     {
@@ -341,7 +342,7 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
             }
             $this->count++;
         } catch (ContentProcessorException $exception) {
-            throw new LocalizedException(__($exception->getMessage()));
+            throw $exception;
         } catch (\Exception $exception) {
             $this->output->write('.');
             $this->verboseLog($exception->getTraceAsString());

app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php

@@ -19,6 +19,8 @@
  * Class FrontendCompilationTest
  *
  * @see \Magento\Developer\Model\View\Asset\PreProcessor\FrontendCompilation
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FrontendCompilationTest extends \PHPUnit_Framework_TestCase
 {

app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/PreprocessorStrategyTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Developer\Test\Unit\Model\View\Asset\PreProcessor;
 
-use Magento\Framework\View\Asset\PreProcessor;
+use Magento\Framework\View\Asset\PreProcessor\Chain;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Developer\Model\Config\Source\WorkflowType;
 use Magento\Developer\Model\View\Asset\PreProcessor\FrontendCompilation;
@@ -104,11 +104,11 @@ public function testProcessAlternativeSource()
     }
 
     /**
-     * @return PreProcessor\Chain|\PHPUnit_Framework_MockObject_MockObject
+     * @return Chain|\PHPUnit_Framework_MockObject_MockObject
      */
     private function getChainMock()
     {
-        $chainMock = $this->getMockBuilder(PreProcessor\Chain::class)
+        $chainMock = $this->getMockBuilder(Chain::class)
             ->disableOriginalConstructor()
             ->getMock();
 

lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php

@@ -88,15 +88,15 @@ public function processContent(File $asset)
                 $errorMessage = PHP_EOL . self::ERROR_MESSAGE_PREFIX . PHP_EOL . $path;
                 $this->logger->critical($errorMessage);
 
-                throw new ContentProcessorException($errorMessage);
+                throw new ContentProcessorException(__($errorMessage));
             }
 
             return $content;
         } catch (\Exception $e) {
             $errorMessage = PHP_EOL . self::ERROR_MESSAGE_PREFIX . PHP_EOL . $path . PHP_EOL . $e->getMessage();
             $this->logger->critical($errorMessage);
 
-            throw new ContentProcessorException($errorMessage);
+            throw new ContentProcessorException(__($errorMessage));
         }
     }
 }

lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php

@@ -9,6 +9,9 @@
 use Magento\Framework\Css\PreProcessor\Instruction\Import;
 use Magento\Framework\View\Asset\LocalInterface;
 
+/**
+ * Class RelatedGenerator
+ */
 class RelatedGenerator
 {
     /**
@@ -19,7 +22,7 @@ class RelatedGenerator
     /**
      * @var \Magento\Framework\View\Asset\Repository
      */
-    private $assetRepo;
+    private $assetRepository;
 
     /**
      * @var \Magento\Framework\Css\PreProcessor\File\Temporary
@@ -28,17 +31,16 @@ class RelatedGenerator
 
     /**
      * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param \Magento\Framework\View\Asset\Repository $assetRepository
      * @param \Magento\Framework\Css\PreProcessor\File\Temporary $temporaryFile
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Framework\View\Asset\Repository $assetRepo,
+        \Magento\Framework\View\Asset\Repository $assetRepository,
         \Magento\Framework\Css\PreProcessor\File\Temporary $temporaryFile
     ) {
         $this->tmpDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-        $this->assetRepo = $assetRepo;
-
+        $this->assetRepository = $assetRepository;
         $this->temporaryFile = $temporaryFile;
     }
 
@@ -71,7 +73,7 @@ public function generate(Import $importGenerator)
      */
     protected function generateRelatedFile($relatedFileId, LocalInterface $asset)
     {
-        $relatedAsset = $this->assetRepo->createRelated($relatedFileId, $asset);
+        $relatedAsset = $this->assetRepository->createRelated($relatedFileId, $asset);
         $this->temporaryFile->createFile($relatedAsset->getPath(), $relatedAsset->getContent());
 
         return $relatedAsset;

lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php

@@ -5,10 +5,12 @@
  */
 namespace Magento\Framework\View\Asset;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Class ContentProcessorException
  */
-class ContentProcessorException extends \RuntimeException
+class ContentProcessorException extends LocalizedException
 {
 
 }

lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php

@@ -14,6 +14,8 @@
 
 /**
  * Class AlternativeSource
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AlternativeSource implements AlternativeSourceInterface
 {

lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php

@@ -22,6 +22,8 @@
  * Class AlternativeSourceTest
  *
  * @see \Magento\Framework\View\Asset\PreProcessor\AlternativeSource
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AlternativeSourceTest extends \PHPUnit_Framework_TestCase
 {