Merge remote-tracking branch 'origin/MAGETWO-62567-Static-Content-Versioning' into okapis-mainline-2.2-pr

Author: cspruiell

app/code/Magento/Deploy/Console/DeployStaticOptions.php

@@ -126,6 +126,11 @@ class DeployStaticOptions
      */
     const LANGUAGES_ARGUMENT = 'languages';
 
+    /**
+     * Static content version
+     */
+    const CONTENT_VERSION = 'content-version';
+
     /**
      * Deploy static command options list
      *
@@ -211,7 +216,14 @@ private function getBasicOptions()
                 null,
                 InputOption::VALUE_NONE,
                 'Create symlinks for the files of those locales, which are passed for deployment, '
-                . 'but have no customizations'
+                . 'but have no customizations.'
+            ),
+            new InputOption(
+                self::CONTENT_VERSION,
+                null,
+                InputArgument::OPTIONAL,
+                'Custom version of static content can be used if running deployment on multiple nodes '
+                . 'to ensure that static content version is identical and caching works properly.'
             ),
             new InputArgument(
                 self::LANGUAGES_ARGUMENT,

app/code/Magento/Deploy/Service/DeployStaticContent.php

@@ -96,7 +96,9 @@ public function deploy(array $options)
             ]
         );
 
-        $version = (new \DateTime())->getTimestamp();
+        $version = !empty($options[Options::CONTENT_VERSION]) && is_string($options[Options::CONTENT_VERSION])
+            ? $options[Options::CONTENT_VERSION]
+            : (new \DateTime())->getTimestamp();
         $this->versionStorage->save($version);
 
         $packages = $deployStrategy->deploy($options);

app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php

@@ -96,7 +96,6 @@ protected function setUp()
             '',
             false
         );
-        $this->versionStorage->expects($this->once())->method('save');
 
         $this->service = new DeployStaticContent(
             $this->objectManager,
@@ -107,14 +106,13 @@ protected function setUp()
         );
     }
 
-    public function testDeploy()
+    /**
+     * @param array $options
+     * @param string $expectedContentVersion
+     * @dataProvider deployDataProvider
+     */
+    public function testDeploy($options, $expectedContentVersion)
     {
-        $options = [
-            'strategy' =>  'compact',
-            'no-javascript' => false,
-            'no-html-minify' => false
-        ];
-
         $package = $this->getMock(Package::class, [], [], '', false);
         $package->expects($this->exactly(1))->method('isVirtual')->willReturn(false);
         $package->expects($this->exactly(3))->method('getArea')->willReturn('area');
@@ -125,7 +123,11 @@ public function testDeploy()
             'package' => $package
         ];
 
-        $this->versionStorage->expects($this->once())->method('save');
+        if ($expectedContentVersion) {
+            $this->versionStorage->expects($this->once())->method('save')->with($expectedContentVersion);
+        } else {
+            $this->versionStorage->expects($this->once())->method('save');
+        }
 
         $queue = $this->getMockBuilder(Queue::class)
             ->disableOriginalConstructor()
@@ -193,4 +195,27 @@ public function testDeploy()
             $this->service->deploy($options)
         );
     }
+
+    public function deployDataProvider()
+    {
+        return [
+            [
+                [
+                    'strategy' =>  'compact',
+                    'no-javascript' => false,
+                    'no-html-minify' => false
+                ],
+                null // content version value should not be asserted in this case
+            ],
+            [
+                [
+                    'strategy' =>  'compact',
+                    'no-javascript' => false,
+                    'no-html-minify' => false,
+                    'content-version' =>  '123456',
+                ],
+                '123456'
+            ]
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php

@@ -130,7 +130,6 @@ protected function tearDown()
      */
     public function testDeploy()
     {
-        //$this->markTestSkipped('Test blocked since it must be run in isolated Filesystem');
         $this->deployService->deploy($this->options);
 
         $this->assertFileExists($this->staticDir->getAbsolutePath('frontend/Magento/zoom1/default/css/root.css'));

setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php

@@ -49,11 +49,6 @@ class DeployStaticContentCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $deployService;
 
-    /**
-     * @var DeployStaticOptions|Mock
-     */
-    private $options;
-
     /**
      * Object manager to create various objects
      *
@@ -75,7 +70,6 @@ protected function setUp()
         $this->inputValidator = $this->getMock(InputValidator::class, [], [], '', false);
         $this->consoleLoggerFactory = $this->getMock(ConsoleLoggerFactory::class, [], [], '', false);
         $this->logger = $this->getMock(ConsoleLogger::class, [], [], '', false);
-        $this->options = $this->getMock(DeployStaticOptions::class, [], [], '', false);
         $this->objectManager = $this->getMockForAbstractClass(ObjectManagerInterface::class);
         $this->appState = $this->getMock(State::class, [], [], '', false);
         $this->deployService = $this->getMock(DeployStaticContent::class, [], [], '', false);
@@ -99,9 +93,11 @@ protected function setUp()
     }
 
     /**
+     * @param array $input
      * @see DeployStaticContentCommand::execute()
+     * @dataProvider executeDataProvider
      */
-    public function testExecute()
+    public function testExecute($input)
     {
         $this->appState->expects($this->once())
             ->method('getMode')
@@ -118,7 +114,19 @@ public function testExecute()
         $this->deployService->expects($this->once())->method('deploy');
 
         $tester = new CommandTester($this->command);
-        $tester->execute([]);
+        $tester->execute($input);
+    }
+
+    public function executeDataProvider()
+    {
+        return [
+            'No options' => [
+                []
+            ],
+            'With static content version option' => [
+                ['--content-version' => '123456']
+            ]
+        ];
     }
 
     /**