MAGETWO-52660: Improve performance of static assets deployment

- MAGETWO-57185:  Porting to 2.1

Author: mslabko

app/code/Magento/Deploy/Test/Unit/Console/Command/DeployStaticContentCommandTest.php

@@ -9,7 +9,6 @@
 use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Framework\Validator\Locale;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\App\State;
 
 require 'FunctionExistMock.php';
 
@@ -45,11 +44,6 @@ class DeployStaticContentCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $validator;
 
-    /**
-     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $appState;
-
     protected function setUp()
     {
         $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
@@ -62,20 +56,17 @@ protected function setUp()
         );
         $this->deployer = $this->getMock(\Magento\Deploy\Model\Deployer::class, [], [], '', false);
         $this->filesUtil = $this->getMock(\Magento\Framework\App\Utility\Files::class, [], [], '', false);
-        $this->appState = $this->getMock(\Magento\Framework\App\State::class, [], [], '', false);
 
         $this->validator = $this->getMock(\Magento\Framework\Validator\Locale::class, [], [], '', false);
         $this->command = (new ObjectManager($this))->getObject(DeployStaticContentCommand::class, [
             'objectManagerFactory' => $this->objectManagerFactory,
             'validator' => $this->validator,
             'objectManager' => $this->objectManager,
-            'appState' => $this->appState,
         ]);
     }
 
     public function testExecute()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->deployer->expects($this->once())->method('deploy');
         $this->objectManager->expects($this->at(0))->method('create')->willReturn($this->filesUtil);
@@ -87,7 +78,6 @@ public function testExecute()
 
     public function testExecuteValidateLanguages()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->deployer->expects($this->once())->method('deploy');
         $this->objectManager->expects($this->at(0))->method('create')->willReturn($this->filesUtil);
@@ -107,7 +97,6 @@ public function testExecuteValidateLanguages()
      */
     public function testExecuteIncludedExcludedLanguages()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->objectManager->expects($this->at(0))->method('create')->willReturn($this->filesUtil);
         $this->validator->expects(self::exactly(2))->method('isValid')->willReturnMap([
@@ -125,7 +114,6 @@ public function testExecuteIncludedExcludedLanguages()
      */
     public function testExecuteIncludedExcludedAreas()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->objectManager->expects($this->at(0))->method('create')->willReturn($this->filesUtil);
 
@@ -139,7 +127,6 @@ public function testExecuteIncludedExcludedAreas()
      */
     public function testExecuteIncludedExcludedThemes()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->objectManager->expects($this->at(0))->method('create')->willReturn($this->filesUtil);
 
@@ -153,7 +140,6 @@ public function testExecuteIncludedExcludedThemes()
      */
     public function testExecuteInvalidLanguageArgument()
     {
-        $this->appState->expects($this->once())->method('getMode')->willReturn(State::MODE_PRODUCTION);
         $this->filesUtil->expects(self::any())->method('getStaticPreProcessingFiles')->willReturn([]);
         $this->objectManager->expects($this->at(0))
             ->method('create')
@@ -162,30 +148,4 @@ public function testExecuteInvalidLanguageArgument()
         $commandTester = new CommandTester($this->command);
         $commandTester->execute($wrongParam);
     }
-
-    /**
-     * @param string $mode
-     * @return void
-     * @expectedException  \Magento\Framework\Exception\LocalizedException
-     * @dataProvider executionInNonProductionModeDataProvider
-     */
-    public function testExecuteInNonProductionMode($mode)
-    {
-        $this->appState->expects($this->any())->method('getMode')->willReturn($mode);
-        $this->objectManager->expects($this->never())->method('create');
-
-        $tester = new CommandTester($this->command);
-        $tester->execute([]);
-    }
-
-    /**
-     * @return array
-     */
-    public function executionInNonProductionModeDataProvider()
-    {
-        return [
-            [State::MODE_DEFAULT],
-            [State::MODE_DEVELOPER],
-        ];
-    }
 }

dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php

@@ -140,43 +140,44 @@ protected function _testCssMinification($requestedUri, $assertionCallback)
     }
 
     /**
-     * @magentoConfigFixture current_store dev/css/minify_files 1
+     * @magentoConfigFixture current_store dev/css/minify_files 0
+     * @magentoAppIsolation enabled
      */
-    public function testCssMinification()
+    public function testCssMinificationOff()
     {
         $this->_testCssMinification(
-            '/frontend/FrameworkViewMinifier/default/en_US/css/styles.min.css',
+            '/frontend/FrameworkViewMinifier/default/en_US/css/styles.css',
             function ($path) {
-                $this->assertEquals(
+                $content = file_get_contents($path);
+                $this->assertNotEmpty($content);
+                $this->assertContains('FrameworkViewMinifier/frontend', $content);
+                $this->assertNotEquals(
                     file_get_contents(
                         dirname(__DIR__)
                         . '/_files/static/expected/styles.magento.min.css'
                     ),
-                    file_get_contents($path),
-                    'Minified files are not equal or minification did not work for requested CSS'
+                    $content,
+                    'CSS is minified when minification turned off'
                 );
             }
         );
     }
 
     /**
-     * @magentoConfigFixture current_store dev/css/minify_files 0
+     * @magentoConfigFixture current_store dev/css/minify_files 1
      */
-    public function testCssMinificationOff()
+    public function testCssMinification()
     {
         $this->_testCssMinification(
-            '/frontend/FrameworkViewMinifier/default/en_US/css/styles.css',
+            '/frontend/FrameworkViewMinifier/default/en_US/css/styles.min.css',
             function ($path) {
-                $content = file_get_contents($path);
-                $this->assertNotEmpty($content);
-                $this->assertContains('FrameworkViewMinifier/frontend', $content);
-                $this->assertNotEquals(
+                $this->assertEquals(
                     file_get_contents(
                         dirname(__DIR__)
                         . '/_files/static/expected/styles.magento.min.css'
                     ),
-                    $content,
-                    'CSS is minified when minification turned off'
+                    file_get_contents($path),
+                    'Minified files are not equal or minification did not work for requested CSS'
                 );
             }
         );